Michael Niedermayer d93cf093f8 Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425' ...

* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
  lavc: Add an internal wrapper around get_format()

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/mpeg12dec.c

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

2014-05-11 21:48:32 +02:00

6.0 KiB

Raw Blame History

View Raw