Michael Niedermayer b19604cc4b 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@gmx.at>

2013-03-26 13:44:09 +01:00

3.6 KiB

Raw Blame History

View Raw