diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-08-13 01:44:52 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-08-13 01:44:52 +0200 |
| commit | ceab04fb5db89052b3d8abcb57b137de24ed42b0 (patch) | |
| tree | fccbf10764ab2615a0a7ddb3805d3e50fc91df1f /libavformat | |
| parent | bc7031265441a47595eadc39a44080e4e1fe208f (diff) | |
| download | ffmpeg-ceab04fb5db89052b3d8abcb57b137de24ed42b0.tar.gz | |
lavc/raw: Support QT b64a ARGB64 rawvideo.
Decoder based on a patch by v0lt, v0lt rambler ru
Fixes ticket #5657.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index d412f06259..cb457dd1d6 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -86,6 +86,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '6', '4', 'a') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') }, /* BOXX */ { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') }, diff --git a/libavformat/version.h b/libavformat/version.h index 07df4072c5..6f47a2f9be 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you belive might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 46 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |