Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)
commit0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c
tree62ce5239426c430905853811a0664351fc55ccee
parentd1ce43a3e8fe18e29a334b1a2fda82215f86f2b9
parent53abe32409f13687c864b3cda077a1aa906a2459
Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'

* commit '53abe32409f13687c864b3cda077a1aa906a2459':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/bitstream_filter.c
libavcodec/parser.c
libavcodec/utils.c