aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/txd.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-09 18:37:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-09 18:43:12 +0200
commite1a983e6010930ab742bede275de1ccf921485b7 (patch)
tree5e1a1d65ff634b5ada12231b10910fcba392a8be /libavformat/txd.c
parentfc97f8e0e2146d9a23092b148de9124de2424446 (diff)
parent0c00fd80ee4791bd70b634084307fc9f179e0412 (diff)
downloadffmpeg-e1a983e6010930ab742bede275de1ccf921485b7.tar.gz
Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'
Just for metadata, this change has been integrated by hand already * commit '0c00fd80ee4791bd70b634084307fc9f179e0412': avconv: split the code for processing input packets out of transcode() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions