OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5621da4
)
avcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs
author
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 6 May 2016 13:52:46 +0000
(15:52 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 6 May 2016 13:57:14 +0000
(15:57 +0200)
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/avcodec.h
patch
|
blob
|
history
diff --git
a/libavcodec/avcodec.h
b/libavcodec/avcodec.h
index
dd209a9
..
3813a0a
100644
(file)
--- 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