asfenc: return error on negative timestamp

[ffmpeg] / libavformat / wv.c

diff --git a/libavformat/wv.c b/libavformat/wv.c
index 39bb6144d30f9ec90a233f0404dffc94a2ffd6b2..f6b96d5ce3ad1699f79100dbedd435a8b0d17fdd 100644 (file)
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
@@ -248,7 +248,7 @@ static int wv_read_header(AVFormatContext *s)
     if (!st)
         return AVERROR(ENOMEM);
     st->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id              = CODEC_ID_WAVPACK;
+    st->codec->codec_id              = AV_CODEC_ID_WAVPACK;
     st->codec->channels              = wc->chan;
     st->codec->channel_layout        = wc->chmask;
     st->codec->sample_rate           = wc->rate;