Michael Niedermayer a9cfbf6d4b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

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

2012-11-22 15:36:50 +01:00

12 KiB

Raw Blame History

View Raw