Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8' | Michael Niedermayer | 2013-02-13 | 8 | -90/+52 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8': qcelp: decode directly to the user-provided AVFrame pcm-bluray: decode directly to the user-provided AVFrame nellymoser: decode directly to the user-provided AVFrame mpc7/8: decode directly to the user-provided AVFrame mpegaudio: decode directly to the user-provided AVFrame mlp/truehd: decode directly to the user-provided AVFrame Conflicts: libavcodec/mpc7.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | qcelp: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | pcm-bluray: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -23/+6 |
| | | |||||
| * | nellymoser: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | mpc7/8: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 3 | -17/+10 |
| | | |||||
| * | mpegaudio: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -20/+20 |
| | | |||||
| * | mlp/truehd: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -11/+6 |
| | | |||||
* | | Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f' | Michael Niedermayer | 2013-02-13 | 5 | -62/+39 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f': mace: decode directly to the user-provided AVFrame libspeex: decode directly to the user-provided AVFrame libopus: decode directly to the user-provided AVFrame libopencore-amr: decode directly to the user-provided AVFrame libgsm: decode directly to the user-provided AVFrame Conflicts: libavcodec/libopusdec.c libavcodec/mace.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | mace: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -11/+5 |
| | | |||||
| * | libspeex: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | libopus: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -13/+12 |
| | | |||||
| * | libopencore-amr: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -18/+10 |
| | | |||||
| * | libgsm: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
* | | Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2' | Michael Niedermayer | 2013-02-13 | 5 | -42/+23 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2': libilbc: decode directly to the user-provided AVFrame dpcm: decode directly to the user-provided AVFrame imc/iac: decode directly to the user-provided AVFrame gsm: decode directly to the user-provided AVFrame Conflicts: libavcodec/dpcm.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | libilbc: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -8/+5 |
| | | |||||
| * | dpcm: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -10/+6 |
| | | |||||
| * | imc/iac: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -12/+7 |
| | | |||||
| * | gsm: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 2 | -12/+5 |
| | | |||||
* | | Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05' | Michael Niedermayer | 2013-02-13 | 6 | -46/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05': g726: decode directly to the user-provided AVFrame g723.1: decode directly to the user-provided AVFrame g722: decode directly to the user-provided AVFrame flac: decode directly to the user-provided AVFrame cinaudio: decode directly to the user-provided AVFrame Conflicts: libavcodec/g723_1.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | g726: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | g723.1: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -10/+6 |
| | | |||||
| * | g722: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 2 | -9/+5 |
| | | |||||
| * | flac: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | cinaudio: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
* | | Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6' | Michael Niedermayer | 2013-02-13 | 5 | -59/+32 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '182821cff43f5f977004d105b86c47ceb20d00d6': dca: decode directly to the user-provided AVFrame cook: decode directly to the user-provided AVFrame comfortnoise: decode directly to the user-provided AVFrame bmvaudio: decode directly to the user-provided AVFrame pcm: decode directly to the user-provided AVFrame Conflicts: libavcodec/pcm.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | dca: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -11/+7 |
| | | |||||
| * | cook: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | comfortnoise: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | bmvaudio: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -16/+5 |
| | | |||||
| * | pcm: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -12/+8 |
| | | |||||
* | | Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20' | Michael Niedermayer | 2013-02-13 | 5 | -48/+28 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20': binkaudio: decode directly to the user-provided AVFrame atrac3: decode directly to the user-provided AVFrame atrac1: decode directly to the user-provided AVFrame ape: decode directly to the user-provided AVFrame amrwb: decode directly to the user-provided AVFrame Conflicts: libavcodec/amrwbdec.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | binkaudio: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -10/+6 |
| | | |||||
| * | atrac3: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | atrac1: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | ape: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -11/+7 |
| | | |||||
| * | amrwb: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
* | | Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31' | Michael Niedermayer | 2013-02-13 | 6 | -49/+43 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31': amrnb: decode directly to the user-provided AVFrame als: decode directly to the user-provided AVFrame alac: decode directly to the user-provided AVFrame adxenc: alloc/free coded_frame instead of keeping it in the ADXContext adx: decode directly to the user-provided AVFrame Conflicts: libavcodec/alsdec.c libavcodec/amrnbdec.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | amrnb: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -9/+5 |
| | | |||||
| * | als: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -14/+9 |
| | | |||||
| * | alac: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -12/+8 |
| | | |||||
| * | adxenc: alloc/free coded_frame instead of keeping it in the ADXContext | Justin Ruggles | 2013-02-12 | 2 | -3/+13 |
| | | |||||
| * | adx: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -8/+5 |
| | | |||||
* | | Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd' | Michael Niedermayer | 2013-02-13 | 6 | -44/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e57daa876bf0cf50782550e366e589441cd8c2bd': adpcm: decode directly to the user-provided AVFrame ac3: decode directly to the user-provided AVFrame aac: decode directly to the user-provided AVFrame 8svx: decode directly to the user-provided AVFrame Conflicts: libavcodec/8svx.c libavcodec/ac3dec.c libavcodec/adpcm.c Merged-by: Michael Niedermayer <[email protected]> | ||||
| * | adpcm: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -13/+9 |
| | | |||||
| * | ac3: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 2 | -9/+5 |
| | | |||||
| * | aac: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 2 | -11/+8 |
| | | |||||
| * | 8svx: decode directly to the user-provided AVFrame | Justin Ruggles | 2013-02-12 | 1 | -10/+6 |
| | | |||||
* | | doc/demuxers: quote command line arguments with @code | Daniel Verkamp | 2013-02-13 | 1 | -5/+5 |
| | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> | ||||
* | | shorten: dont leave invalid channel counts in the context. | Michael Niedermayer | 2013-02-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | Fixes freeing invalid addresses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]> | ||||
* | | tiff: Check buffer allocation and pointer increment more carefully in ↵ | Michael Niedermayer | 2013-02-12 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | | | shorts2str() and double2str() Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]> |