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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/raw.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/raw.h b/libavcodec/raw.h index 3e59f28e33..a4179930a3 100644 --- a/libavcodec/raw.h +++ b/libavcodec/raw.h @@ -41,4 +41,7 @@ enum AVPixelFormat ff_find_pix_fmt(const PixelFormatTag *tags, unsigned int four #endif enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc); +extern av_export const PixelFormatTag avpriv_pix_fmt_bps_avi[]; +extern av_export const PixelFormatTag avpriv_pix_fmt_bps_mov[]; + #endif /* AVCODEC_RAW_H */ |