diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
| commit | d0ab71ed11c54c40b1c975c713dee8d3993ccdc5 (patch) | |
| tree | d0849ac53365bcac864997d67825435cd907740b /libavcodec/dcadata.h | |
| parent | 719fde47ca641edd4321f384579438f930bc50eb (diff) | |
| parent | 292a08cbab3392a693b1c3b03a9cac6a1b65d304 (diff) | |
| download | ffmpeg-d0ab71ed11c54c40b1c975c713dee8d3993ccdc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: cosmetics, reformat ff_asf_parse_packet()
g.723.1: add missing CODEC_CAP_DR1
avconv: remove now unneeded calls to avcodec_get_frame_defaults().
lavc: initialize output AVFrame before decoding.
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
0 files changed, 0 insertions, 0 deletions