aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_h263_rfc2190.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 21:44:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 21:44:25 +0200
commit8e7c8325d202d7cd59cfab4172760a3a5c3799ed (patch)
tree9d879fda5a5ffd0b8fb31246538ecec37e562761 /libavformat/rtpdec_h263_rfc2190.c
parent4b13ec69c6a23dd25d048bb129fadba131849cf9 (diff)
parent3f3232a371cc88696184d9aef1f812656264e56c (diff)
downloadffmpeg-8e7c8325d202d7cd59cfab4172760a3a5c3799ed.tar.gz
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'
* commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_h263_rfc2190.c')
0 files changed, 0 insertions, 0 deletions