diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:18:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 10:18:35 +0100 |
| commit | 70a65ecabff00a8330a56ceb51b15d10cb5b5389 (patch) | |
| tree | 5d50bdef5dee2f182203f0b4d05e5dad013d37a1 /libavresample/resample.c | |
| parent | f023003ce610a8fd6377cf4a8e98002ac3117ef4 (diff) | |
| parent | 9a7b56883d1333cdfcdf0fa7584a333841b86114 (diff) | |
| download | ffmpeg-70a65ecabff00a8330a56ceb51b15d10cb5b5389.tar.gz | |
Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114':
au: set bit rate
au: validate bits-per-sample separately from codec tag
rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/resample.c')
0 files changed, 0 insertions, 0 deletions