aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp8dsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-20 01:11:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-20 01:11:54 +0200
commit62899d79a380aadd95793beb096e74eb9c8b8776 (patch)
tree1bb5daa29f9f3eda3621d9aaf62963afb17b34df /libavcodec/vp8dsp.c
parent45283653a30e33a8ef0e35f2f6f502de2f93ce22 (diff)
parentba8ab4e7ae016cf970b0f335a7933f2db53784bc (diff)
downloadffmpeg-62899d79a380aadd95793beb096e74eb9c8b8776.tar.gz
Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1
* commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc': avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8dsp.c')
0 files changed, 0 insertions, 0 deletions