diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:26:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:30:12 +0200 |
| commit | e46cc1dab05e366feaf98efc9bd2d57e2fa58410 (patch) | |
| tree | c267da204835358c88066a4f7904213a4e3d89bd /arch.mak | |
| parent | a72df4dadc0dd4347e5cd0dc0674f59f16e89c95 (diff) | |
| parent | 43e7f0797f9f821a3866a20f05e512e13c82076a (diff) | |
| download | ffmpeg-e46cc1dab05e366feaf98efc9bd2d57e2fa58410.tar.gz | |
Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'
* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
flvenc: only write the framerate tag based on avg_frame_rate
Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/vsynth2-flv
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions