mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-22 09:15:06 +02:00
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:c8f25cafd2
See:5eaed6d336
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
40e8967ee1