aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.GPLv3
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-10 12:13:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-10 12:23:17 +0200
commit40e8967ee161a9d247419e77da745e939f0ddaf8 (patch)
treedf9d512ea99d5d853e683333f4d1f373d72af7a4 /COPYING.GPLv3
parentccf9211e29bdfad02faf93575bf39a8f89c30647 (diff)
parent22e76ec635bafdd1d1ec35581a7ac09e69e3c43e (diff)
downloadffmpeg-40e8967ee161a9d247419e77da745e939f0ddaf8.tar.gz
Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'
* commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e': atrac3: set the getbits context the right buffer_end atrac3: fix error handling Conflicts: libavcodec/atrac3.c No change as these issues have been fixed previously See: c8f25cafd2f23662bcb1e62965c0c42d6989688a See: 5eaed6d33689cc6f6e7c07463ede6b387b08afc4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions