Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 16:51:57 +0000 (18:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:16:57 +0000 (19:16 +0200)
commiteacf7d650dfe6e97d6100a232fa6a89592b625b5
tree08ac45fefde0eab9e8084743ee5a808f39f77d69
parentbeeb7551d6ab44bc6a1125e6d537508bff3694fc
parent0c1959b056f6ccaa2eee2c824352ba93c8e36d52
Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'

* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
  lavf: add AVFMT_FLAG_BITEXACT.

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/matroskaenc.c
libavformat/movenc.c
libavformat/mux.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate-run.sh
tests/fate/filter-audio.mak
tests/fate/video.mak
tests/fate/wavpack.mak
tests/regression-funcs.sh