Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25' | Michael Niedermayer | 2015-06-12 | 1 | -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 file | Vittorio Giovara | 2015-06-12 | 1 | -0/+71 |
| | | |||||
* | | Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e' | Michael Niedermayer | 2014-06-23 | 1 | -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 file | Diego Biurrun | 2014-06-22 | 1 | -0/+59 |