aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp56dsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-24 13:53:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-24 13:54:24 +0200
commitff584803b7ea31febb3f57124a3702d13c27e24c (patch)
treeb8f22d7053d443db3929d5fe210a2c1a18eca3c8 /libavcodec/vp56dsp.h
parent874b9dcc4be78847e488df33aad51752a8bebc2e (diff)
parentcee1950bbb44acd215efd2101fb52d9605701969 (diff)
downloadffmpeg-ff584803b7ea31febb3f57124a3702d13c27e24c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtp: Packetization of JPEG (RFC 2435) smoothstreamingenc: Copy the SAR on the AVStreams as well Conflicts: Changelog libavformat/rtpenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56dsp.h')
0 files changed, 0 insertions, 0 deletions