diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-20 22:35:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-20 22:35:38 +0200 |
| commit | 5cc3faf6198b881e2f0aa65ac72aa2671e5b015b (patch) | |
| tree | ceb13c3b2a682800cbb5abd050039d96838264fc /doc/examples/remuxing.c | |
| parent | b97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee (diff) | |
| parent | 75c1ed2e4c7250f5e75a11d0140727054ff0136b (diff) | |
Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
ffv1enc: Use input frame to set SAR and interlacing
Conflicts:
libavcodec/ffv1enc.c
No change as the removed coded_frame uses where not in the code anymore
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples/remuxing.c')
0 files changed, 0 insertions, 0 deletions