summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg_er.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'Michael Niedermayer2014-06-231-4/+4
| | | | | | | | | | | | * commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file Conflicts: configure libavcodec/Makefile libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* mpeg: Split error resilience bits off into a separate fileDiego Biurrun2014-06-221-0/+26
OpenPOWER on IntegriCloud