diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 00:58:31 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 00:59:33 +0400 |
| commit | f61498e1dfbac9f07f826340c00f9caf7235766c (patch) | |
| tree | d5ab0f2f45b390a51bb4d43852e59bde868734f0 /ffmpeg_filter.c | |
| parent | ca4dd3810e20028d100e39bc42ebc39712c70573 (diff) | |
| parent | 9e696d2e5ffaa763c564682ec18c3b51b3e5fccc (diff) | |
Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'
Merge only for metadata, functionality had been previously integrated.
* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
h264: support frame parameter changes during frame-mt
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions