Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 12:47:12 +0000 (13:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 12:47:12 +0000 (13:47 +0100)
commitc5eb725fd33ee705c3c7d674ae65bbb717bf7207
tree27998b149b222fdb19fd20fd78b7365a7f1b731a
parent9fb5a91c66934dab395ff32eb524a3dbe08b53d8
parent8a9641a652ed1546fedfda22584f79d3d423096e
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'

* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
  bsf: check memory allocations

Conflicts:
libavcodec/noise_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bitstream_filter.c
libavcodec/dump_extradata_bsf.c
libavcodec/imx_dump_header_bsf.c
libavcodec/mjpega_dump_header_bsf.c
libavcodec/movsub_bsf.c
libavcodec/parser.c