aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-03 23:49:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 23:49:14 +0100
commitbd12634d6b83e196515c52ccaa9b7513c1023b6f (patch)
treef8bf3873887649509ab0660dea8ff2436cfd8ecb /libavcodec/mpeg4data.h
parent1dc1c4e7a82edb13420f064890fbde3751ca18c9 (diff)
parentec524ed12aa1aeb37125203f1adf5aa10dfcb0de (diff)
downloadffmpeg-bd12634d6b83e196515c52ccaa9b7513c1023b6f.tar.gz
Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'
* commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de': tta: Fix framepos and start_offset types Conflicts: libavformat/tta.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4data.h')
0 files changed, 0 insertions, 0 deletions