diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 14:17:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 14:52:03 +0200 |
| commit | 2b7f595aca84d421767e9755ce81d8a621898264 (patch) | |
| tree | 4d9387b90de010612d24e872119fd53c948bb41d /Makefile | |
| parent | 22dc25cb29ab7b84d6d03f56766a15b6556a7b11 (diff) | |
| parent | 76d23f40314fc1dcd74a3d470b17782cc0ee5a3a (diff) | |
| download | ffmpeg-2b7f595aca84d421767e9755ce81d8a621898264.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions