Merge commit '60b055133485891405722bc9722e2c74fc9764b8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:16:15 +0000 (23:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:16:50 +0000 (23:16 +0100)
commit70cbb473608b0746d0ca4a5614b038d8f722d476
treee9741a866e820b7758d4f495be1a911544555dee
parent287eb69973f8066a68e924bdf9433b2faad01dfa
parent60b055133485891405722bc9722e2c74fc9764b8
Merge commit '60b055133485891405722bc9722e2c74fc9764b8'

* commit '60b055133485891405722bc9722e2c74fc9764b8':
  png_parser: fix size of chunk_lenght

Conflicts:
libavcodec/png_parser.c

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