aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegutils.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'Michael Niedermayer2014-03-171-0/+16
|\ | | | | | | | | | | | | | | | | | | * 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-161-0/+16
| | | | | | | | Drop the mpegvideo dependency for svq3 in configure.
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-171-4/+4
|/ | | | | | | | | | | | | * 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-161-0/+111