Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:30:21 +0000 (11:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:30:29 +0000 (11:30 +0100)
* commit 'eee2000b41234ae9465c314e18bfec1700181f32':
  mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_parser.c

Simple merge
Simple merge
Simple merge
Simple merge