aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vsrc_mptestsrc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-05 15:42:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-05 15:51:55 +0200
commitd5ec1ddf7bb0beb65319c749afc8fba2798a8ee1 (patch)
tree773623f7aadf7b6f365b5024092c44489ed0affd /libavfilter/vsrc_mptestsrc.c
parent22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d (diff)
parent9580818c5d934bde65a95efd2cee61c174721092 (diff)
downloadffmpeg-d5ec1ddf7bb0beb65319c749afc8fba2798a8ee1.tar.gz
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
* commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_mptestsrc.c')
0 files changed, 0 insertions, 0 deletions