diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:17:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:19:28 +0200 |
| commit | 4aeafbaab891d81c377f92be3969d8d3e6abf379 (patch) | |
| tree | b2f5af6cc5ba152e6c5df9fa1f3e43edc75727a2 /libavfilter/vf_fieldorder.c | |
| parent | 3e1483d03e8e2439b4c31d782bb7126ba1afdc6c (diff) | |
| parent | 103d073dd7ce23b912df32be8c9524ba25dd5991 (diff) | |
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
h264_parser: Use ff_h264_reset_sei()
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_fieldorder.c')
0 files changed, 0 insertions, 0 deletions