diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-02 14:40:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-02 14:57:36 +0100 |
| commit | 8551c6bec0fd6cf719f94b24bca39b1c3318e213 (patch) | |
| tree | 9ba0df8011bead24b8a66dd0b0c2e6e544a7edf3 /libavformat/oggparseopus.c | |
| parent | 6788350281c418f0f395a8279eee82f7abe7c63b (diff) | |
| parent | e1c804d883f3cca1b492147a2ac5d0aea7460076 (diff) | |
| download | ffmpeg-8551c6bec0fd6cf719f94b24bca39b1c3318e213.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv1394: Swap the min and max values of the 'standard' option
rtpdec_vp8: Don't parse fields that aren't used
lavc: add some AVPacket doxy.
audiointerleave: deobfuscate a function call.
rtpdec: factorize identical code used in several handlers
a64: remove interleaved mode.
doc: Point to the new location of the c99-to-c89 tool
decode_audio3: initialize AVFrame
ws-snd1: set channel layout
wmavoice: set channel layout
wmapro: use AVCodecContext.channels instead of keeping a private copy
wma: do not keep private copies of some AVCodecContext fields
Conflicts:
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseopus.c')
0 files changed, 0 insertions, 0 deletions