diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-12 00:17:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-12 00:17:35 +0200 |
| commit | 27763db928b594208ce6e241e1eb48799093796e (patch) | |
| tree | b0456943086a8eda1f9aca8484c9b8bfc69712c7 /libavcodec/raw.c | |
| parent | 88ceede1fd7835080da11c4e9a74af69bdfc5412 (diff) | |
| parent | c43222f436e941db3764576fc967da66f3709c35 (diff) | |
| download | ffmpeg-27763db928b594208ce6e241e1eb48799093796e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Improve amr bitrate calculation for VBR files.
Warn if rawvideo and an unreadable pix_fmt are written.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/raw.c')
| -rw-r--r-- | libavcodec/raw.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 16b1b39945..551a1722fc 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -234,3 +234,28 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt) } return 0; } + +const PixelFormatTag avpriv_pix_fmt_bps_avi[] = { + { AV_PIX_FMT_MONOWHITE, 1 }, + { AV_PIX_FMT_PAL8, 2 }, + { AV_PIX_FMT_PAL8, 4 }, + { AV_PIX_FMT_PAL8, 8 }, + { AV_PIX_FMT_RGB444LE, 12 }, + { AV_PIX_FMT_RGB555LE, 15 }, + { AV_PIX_FMT_RGB555LE, 16 }, + { AV_PIX_FMT_BGR24, 24 }, + { AV_PIX_FMT_BGRA, 32 }, + { AV_PIX_FMT_NONE, 0 }, +}; + +const PixelFormatTag avpriv_pix_fmt_bps_mov[] = { + { AV_PIX_FMT_MONOWHITE, 1 }, + { AV_PIX_FMT_PAL8, 2 }, + { AV_PIX_FMT_PAL8, 4 }, + { AV_PIX_FMT_PAL8, 8 }, + { AV_PIX_FMT_RGB555BE, 16 }, + { AV_PIX_FMT_RGB24, 24 }, + { AV_PIX_FMT_ARGB, 32 }, + { AV_PIX_FMT_MONOWHITE,33 }, + { AV_PIX_FMT_NONE, 0 }, +}; |