aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtspenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-05 14:55:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-05 14:55:26 +0200
commit1f40536ccaeac488fb0766da7ed05a13bf5263ba (patch)
tree91df0ee3b1d49c5ba937bbbfdd3fc80c0b274cc8 /libavformat/rtspenc.c
parent42b7bda41a4f7717d41b576e184da2875f7972f2 (diff)
parent650a5206a944fd36a42d92f98e745972056b1f7c (diff)
downloadffmpeg-1f40536ccaeac488fb0766da7ed05a13bf5263ba.tar.gz
Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'
* commit '650a5206a944fd36a42d92f98e745972056b1f7c': avconv: rename 'icodec' to 'dec_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspenc.c')
0 files changed, 0 insertions, 0 deletions