aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg12dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 12:35:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 12:41:04 +0200
commitb7fc2693c70fe72936e4ce124c802ac23857c476 (patch)
tree6633a69bc7ab53e1478bb2210e25b834da038aa5 /libavcodec/mpeg12dec.c
parent6d77279ed81c5db8a9f7b895d5090c0328c12174 (diff)
parent488a0fa68973d48e264d54f1722f7afb18afbea7 (diff)
downloadffmpeg-b7fc2693c70fe72936e4ce124c802ac23857c476.tar.gz
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
0 files changed, 0 insertions, 0 deletions