Michael Niedermayer 56afbe8dbc Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e' ...

* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
  mpeg: Split error resilience bits off into a separate file

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/mpegvideo.c

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

2014-06-23 03:48:30 +02:00

921 B

Raw Blame History

View Raw