aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/adtsenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-24 01:50:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-24 01:50:01 +0200
commitab0f78ea77779e9f87015910ef235b6d1e6d2ccb (patch)
tree084a833ebcd040ff3409899bd22d7460d190b6ba /libavformat/adtsenc.c
parent02ea384abd8ef53a1e4654ab0c9e72e08141d751 (diff)
parentd0de7330b973b354e2ceb0b99fd545b868b0a9c4 (diff)
downloadffmpeg-ab0f78ea77779e9f87015910ef235b6d1e6d2ccb.tar.gz
Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'
* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4': fft-test: Pass correct struct members to (i)dct functions Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/adtsenc.c')
0 files changed, 0 insertions, 0 deletions