Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Nov 2012 14:36:50 +0000 (15:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Nov 2012 14:36:50 +0000 (15:36 +0100)
commita9cfbf6d4b08a8b4ceb610f08f1cc232b090ba8f
treed5d3080338172b270439e283e8b96c07fbe3ad56
parentc8a5365dcf14e930d1fd06bf10662aae78182da4
parent9ae80e6a9cefcab61e867256ba19ef78a4bfe0cb
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>
libavcodec/cdgraphics.c
libavformat/apetag.c
libavformat/id3v2.c