summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg_er.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'Michael Niedermayer2015-06-121-0/+71
|\ | | | | | | | | | | | | | | | | | | * commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25': mpegvideo: Move ER functions to a separate file Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ER functions to a separate fileVittorio Giovara2015-06-121-0/+71
| |
* | Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'Michael Niedermayer2014-06-231-4/+5
|/ | | | | | | | | | | | * 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/+59
OpenPOWER on IntegriCloud