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:
42c8f92
)
riff: Support ProRes in avi (APCH fourcc)
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 10 Feb 2015 19:33:24 +0000
(14:33 -0500)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 17 Feb 2015 17:18:20 +0000
(12:18 -0500)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
776a25f
..
a093986
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-349,6
+349,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') },
{ AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') },
{ AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'N') },
+ { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'H') },
{ AV_CODEC_ID_NONE, 0 }
};