diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:45:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:45:10 +0200 |
| commit | 952738d0af74041c9ad8ac17f6d848a6d69fb3f1 (patch) | |
| tree | 724022064017b561853e030dee3d3cf1f5aaea86 /libswresample/swresample_test.c | |
| parent | d499685d8020b919f0953fd358f2e8dc9a206783 (diff) | |
| parent | 6f4404b24bcf59ab29cd4b57995d374a578f51a7 (diff) | |
| download | ffmpeg-952738d0af74041c9ad8ac17f6d848a6d69fb3f1.tar.gz | |
Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10
* commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7':
h264: set parameters from SPS whenever it changes
alac: Limit max_samples_per_frame
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_test.c')
0 files changed, 0 insertions, 0 deletions