summaryrefslogtreecommitdiff
path: root/libavcodec/mpegutils.h
Commit message (Collapse)AuthorAge
* Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'Hendrik Leppkes2015-09-12
|\ | | | | | | | | | | | | * commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b': lavc: Sanitize header inclusion guards Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Sanitize header inclusion guardsVittorio Giovara2015-09-12
| | | | | | | | | | | | Fix typos, add missing comments, and remove stray lines. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'Michael Niedermayer2015-06-08
|\| | | | | | | | | | | | | * commit '925b80d64029d41962e5998d7d901226c3a9baea': mpegvideo: Move OutFormat enum to mpegutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move OutFormat enum to mpegutils.hVittorio Giovara2015-06-08
| | | | | | | | It is necessary to avoid circular header dependencies.
* | Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit 'be039278b5ebd8075d90a3508db2aed5adf59e02': mpegvideo: move ff_draw_horiz_band() to mpegutils.c Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move ff_draw_horiz_band() to mpegutils.cVittorio Giovara2014-03-16
| | | | | | | | Drop the mpegvideo dependency for svq3 in configure.
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-17
|/ | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-16