diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 12:44:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 12:44:07 +0200 |
| commit | db3e12a828553171f37c98119679316720e4caed (patch) | |
| tree | 3b310b95ae93871f31d541082a0c5969cbce79be /tests/ref/fate/sub-webvttenc | |
| parent | 843be56ee18928ecf80bcb20d235c4f9cab5a8fd (diff) | |
| parent | 59245e0c5e10a849e67c632cccf4f677b2442e82 (diff) | |
| download | ffmpeg-db3e12a828553171f37c98119679316720e4caed.tar.gz | |
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
avconv: set the encoding/decoding_needed flags earlier
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests/ref/fate/sub-webvttenc')
0 files changed, 0 insertions, 0 deletions