diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:09:17 +0100 |
| commit | f392949f1ac799ad1d7c1cda66e41c1670022d5a (patch) | |
| tree | e3b97d59c99dfc21cf92abb7b71305f4e59f408a /libavformat/img2.c | |
| parent | 68014c6ed98b5c90f4dc211429dd269ac727be4b (diff) | |
| parent | ae17878fb2ab100264226c84c58f5b95a703312f (diff) | |
| download | ffmpeg-f392949f1ac799ad1d7c1cda66e41c1670022d5a.tar.gz | |
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 183bf73c6d..80020549f6 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -57,8 +57,8 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_TIFF, "tif" }, { AV_CODEC_ID_SGI, "sgi" }, { AV_CODEC_ID_PTX, "ptx" }, + { AV_CODEC_ID_BRENDER_PIX,"pix" }, { AV_CODEC_ID_PCX, "pcx" }, - { AV_CODEC_ID_BRENDER_PIX, "pix" }, { AV_CODEC_ID_SUNRAST, "sun" }, { AV_CODEC_ID_SUNRAST, "ras" }, { AV_CODEC_ID_SUNRAST, "rs" }, |