aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-25 22:00:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-25 22:00:06 +0200
commitf7d4e26c6a0a11c255e22994fabd97a4e62e3d01 (patch)
tree65c18e3f9064ed481b0001beac05e194232260eb /ffplay.c
parent9746f87f154029ed5866cbc02ba0d57f5b5c283f (diff)
parent758377a2b79a35386978b0af1196d36cbcfb8f64 (diff)
downloadffmpeg-f7d4e26c6a0a11c255e22994fabd97a4e62e3d01.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtmp: Add a new option 'rtmp_pageurl' doc: Update the description of the rtmp_tcurl option rtmp: Make the description of the rtmp_tcurl option more generic libfdk-aacenc: add LATM/LOAS encapsulation support sctp: add port missing error message tcp: add port missing error message avfilter: Fix printf format string conversion specifier Conflicts: libavcodec/version.h libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions