diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:00:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-25 14:49:11 +0200 |
| commit | 39ed5442620a7a0fd2328b7d4aefc6ae152c5441 (patch) | |
| tree | 7ca07da5d9514e85e55aade0e6ca1346343446fa /libavcodec/targa.c | |
| parent | f9e6fb50ceac05f8e0e9ff4a9a99674407fc8b85 (diff) | |
| download | ffmpeg-39ed5442620a7a0fd2328b7d4aefc6ae152c5441.tar.gz | |
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9d887c225466576ae80ef7f2b109e866ff137b2)
Conflicts:
libavcodec/h264.c
Diffstat (limited to 'libavcodec/targa.c')
0 files changed, 0 insertions, 0 deletions