diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:27:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:27:56 +0200 |
| commit | e3c1d9a56c715223284d5bfbcad5cd1f78a798f9 (patch) | |
| tree | d3b49061b4ff556f3e23fb6d58823c9c3b3d057c | |
| parent | f29cdfec961d41bd4905a2983a74e7c814cfb851 (diff) | |
| parent | ed7922faac4ea4c893efc3cdf8102ebc49fcc011 (diff) | |
| download | ffmpeg-e3c1d9a56c715223284d5bfbcad5cd1f78a798f9.tar.gz | |
Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'
* commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011':
mux: drop one of the hacks comprising compute_pkt_fields2()
Conflicts:
libavformat/mux.c
Not merged as -async drop / -vsync drop depends on this code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions