diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 21:20:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 21:20:06 +0100 |
| commit | e2d110d8d21469987b6e5866398ef01654560c3b (patch) | |
| tree | 07a5e3d639e1fe53e685a25f9396bd90705740e2 /libavcodec/bethsoftvideo.c | |
| parent | adb98a3d2294929334bd7570ebd42edfe30151f5 (diff) | |
| parent | 73ad4471a48bd02b2c2a55de116161b87e061023 (diff) | |
| download | ffmpeg-e2d110d8d21469987b6e5866398ef01654560c3b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: Handle only complete frames in frame-mt.
MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
configure: die if x11grab dependencies are unavailable
zerocodec: factorize loop
avconv: fix the resampling safety factors for output audio buffer allocation
avconv: move audio output buffer allocation to a separate function
avconv: make the async buffer global and free it in exit_program()
Conflicts:
ffmpeg.c
libavcodec/mpegvideo.c
libavcodec/rv34.c
libavcodec/zerocodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
0 files changed, 0 insertions, 0 deletions