FFmpeg/libavcodec
Michael Niedermayer fb17f03dad Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 02:56:29 +01:00
..
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-29 01:11:16 +01:00
2013-12-15 16:53:32 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2013-12-28 18:19:46 +01:00
2014-01-02 22:07:09 +01:00
2013-12-29 01:11:16 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2013-12-31 12:19:59 +01:00
2013-12-31 12:19:59 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2013-12-10 16:18:51 +01:00
2013-12-22 14:59:31 +01:00
2013-12-22 14:59:31 +01:00
2013-12-29 01:11:16 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00