[FFmpeg-cvslog] Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 26 13:32:12 2013 +0100| [b19604cc4bbff8a533efdd6cb3b79327d666d29a] | committer: Michael Niedermayer

Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'

* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
  lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/internal.h
	libavcodec/mpeg12.c
	libavcodec/utils.c
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b19604cc4bbff8a533efdd6cb3b79327d666d29a
---