diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:01:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:23:45 +0200 |
| commit | ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002 (patch) | |
| tree | 884b721a07e241495ab86a2317d929a8b71dbee8 /libavcodec/pthread_frame.c | |
| parent | 580c86925ddf8c85d2e6f57ed55dd75853748b29 (diff) | |
| parent | ee62b364be0c30cba83b5ff10a3ca8c3e866ade6 (diff) | |
| download | ffmpeg-ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002.tar.gz | |
Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'
* commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6':
h264: eliminate ff_h264_set_parameter_from_sps()
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
0 files changed, 0 insertions, 0 deletions