aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-18 21:26:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-18 21:31:51 +0200
commit1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (patch)
tree621f7e9cdf461b997ef614f6c9c4c5657089e471 /libavcodec/x86
parentc01bcce4959a208a4f6b66fd527760ed45cd29bb (diff)
parent6656370b858329ca07a60a2de954d5e90daa0206 (diff)
downloadffmpeg-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.tar.gz
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206': avconv: set the "encoder" tag when transcoding Conflicts: ffmpeg.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions