diff options
| author | Jimmy Christensen <jimmy@ghost.dk> | 2009-06-12 05:29:29 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-06-12 05:29:29 +0000 |
| commit | 94d3d6a468b0cba859157f12959b6b82b4fc6c79 (patch) | |
| tree | 5e880758eb1bfaf9dd8e6ba7f368c310a9adaa38 /libavformat | |
| parent | 34edd9948dbb1675c3251fd2b9fb145ec0070f4a (diff) | |
DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk
Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 48f3dfc4a5..ad22d224bf 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -72,6 +72,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_SUNRAST , "im24"}, { CODEC_ID_SUNRAST , "sunras"}, { CODEC_ID_JPEG2000 , "jp2"}, + { CODEC_ID_DPX , "dpx"}, { CODEC_ID_NONE , NULL} }; diff --git a/libavformat/isom.c b/libavformat/isom.c index b706c45194..0a410c17c4 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -168,6 +168,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ + { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */ { CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/riff.c b/libavformat/riff.c index 858c924b7e..d9b4f449a7 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -212,6 +212,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') }, { CODEC_ID_AURA, MKTAG('A', 'U', 'R', 'A') }, { CODEC_ID_AURA2, MKTAG('A', 'U', 'R', '2') }, + { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, { CODEC_ID_NONE, 0 } }; |