aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/acodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-19 18:27:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-19 18:27:56 +0200
commite3c1d9a56c715223284d5bfbcad5cd1f78a798f9 (patch)
treed3b49061b4ff556f3e23fb6d58823c9c3b3d057c /tests/ref/acodec
parentf29cdfec961d41bd4905a2983a74e7c814cfb851 (diff)
parented7922faac4ea4c893efc3cdf8102ebc49fcc011 (diff)
downloadffmpeg-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>
Diffstat (limited to 'tests/ref/acodec')
0 files changed, 0 insertions, 0 deletions