[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 22 15:36:50 2012 +0100| [a9cfbf6d4b08a8b4ceb610f08f1cc232b090ba8f] | committer: Michael Niedermayer

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 at gmx.at>

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