ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri May 6 15:52:46 2016 +0200| [58b3e5606b993bcd9a202f9518d57c0d20d6e449] | committer: Michael Niedermayer
avcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58b3e5606b993bcd9a202f9518d57c0d20d6e449 --- libavcodec/avcodec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dd209a9..3813a0a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -386,7 +386,6 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, - AV_CODEC_ID_M101, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, @@ -406,6 +405,7 @@ enum AVCodecID { AV_CODEC_ID_DAALA, AV_CODEC_ID_CFHD, AV_CODEC_ID_TRUEMOTION2RT, + AV_CODEC_ID_M101, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog