Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:47:25 +0000 (18:47 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:47:40 +0000 (18:47 +0100)
commitaf9cac1be1750ecc0e12c6788a3aeed1f1a778be
tree2e34226dbd4010774f6ffef448aab4b7d4f88544
parent6d160afab2fa8d3bfb216fee96d3537ffc9e86e8
parent33d18982fa03feb061c8f744a4f0a9175c1f63ab
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'

* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
  lavc: add a new bitstream filtering API

Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
26 files changed:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/aac_adtstoasc_bsf.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/bitstream_filter.c
libavcodec/bitstream_filters.c
libavcodec/bsf.c
libavcodec/bsf.h
libavcodec/chomp_bsf.c
libavcodec/dca_core_bsf.c
libavcodec/dump_extradata_bsf.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/hevc_mp4toannexb_bsf.c
libavcodec/imx_dump_header_bsf.c
libavcodec/mjpeg2jpeg_bsf.c
libavcodec/mjpega_dump_header_bsf.c
libavcodec/movsub_bsf.c
libavcodec/mp3_header_decompress_bsf.c
libavcodec/mpeg4_unpack_bframes_bsf.c
libavcodec/noise_bsf.c
libavcodec/remove_extradata_bsf.c
libavcodec/version.h
libavcodec/vp9_superframe_bsf.c
libavformat/mux.c