summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'Michael Niedermayer2013-11-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa': libxvid: use the AVFrame API properly. pcxenc: use the AVFrame API properly. roqvideo: remove unused variables libschroedingerenc: use the AVFrame API properly. Conflicts: libavcodec/pcxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * pcxenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * roqvideo: remove unused variablesAnton Khirnov2013-11-16
| |
| * libschroedingerenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476': eatgv: use the AVFrame API properly. libxavs: use the AVFrame API properly. nuv: use the AVFrame API properly. flashsvenc: use the AVFrame API properly. Conflicts: libavcodec/eatgv.c libavcodec/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eatgv: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * libxavs: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * nuv: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * flashsvenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57e7b3a89f5a0879ad039e8f04273b48649799a8': dnxhdenc: use the AVFrame API properly. libx264: use the AVFrame API properly. svq1enc: use the AVFrame API properly. gif: use the AVFrame API properly. Conflicts: libavcodec/gif.c libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dnxhdenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * libx264: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * svq1enc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * gif: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7': sunrastenc: use the AVFrame API properly. targaenc: use the AVFrame API properly. tiffenc: use the AVFrame API properly. pngenc: use the AVFrame API properly. Conflicts: libavcodec/pngenc.c libavcodec/sunrastenc.c libavcodec/targaenc.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sunrastenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * targaenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * tiffenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * pngenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | * commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc': lclenc: use the AVFrame API properly. Conflicts: libavcodec/lclenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lclenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd48c20630214a4effcc920e93a5044bee4e2002e': qtrleenc: use the AVFrame API properly. ulti: use the AVFrame API properly. vc1: use the AVFrame API properly. flashsv: use the AVFrame API properly. Conflicts: libavcodec/flashsv.c libavcodec/qtrleenc.c libavcodec/ulti.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qtrleenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * ulti: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * vc1: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * flashsv: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462': eamad: use the AVFrame API properly. dpxenc: use the AVFrame API properly. bmpenc: use the AVFrame API properly. sgienc: use the AVFrame API properly. Conflicts: libavcodec/bmpenc.c libavcodec/dpxenc.c libavcodec/eamad.c libavcodec/sgienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eamad: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * dpxenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * bmpenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * sgienc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7': mss4: use the AVFrame API properly. mss3: use the AVFrame API properly. mss2: use the AVFrame API properly. mss1: use the AVFrame API properly. Conflicts: libavcodec/mss1.c libavcodec/mss2.c libavcodec/mss3.c libavcodec/mss4.c See: 02fe531afefa7ac3fcc552f8e83461a4bfa7f868 See: ff1c13b133d548b3ce103f91999b6cc1bb7e65cc See: 310bf283542ff81a9ec8fa7492fe7d625e80562f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mss4: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * mss3: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * mss2: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * mss1: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '508b37557bf36eae83c18e64d42f27b44a321d81': tiertexseqv: use the AVFrame API properly. smc: use the AVFrame API properly. truemotion2: use the AVFrame API properly. truemotion1: use the AVFrame API properly. Conflicts: libavcodec/smc.c libavcodec/tiertexseqv.c libavcodec/truemotion1.c libavcodec/truemotion2.c See: e999f2339ab0200039ee7123b75d79a52aaac5d1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiertexseqv: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * smc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * truemotion2: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * truemotion1: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a4841d4e0f0dc50998511bf6c48b518012024db': fraps: use the AVFrame API properly. rpza: use the AVFrame API properly. motionpixels: use the AVFrame API properly. vmdvideo: use the AVFrame API properly. Conflicts: libavcodec/fraps.c libavcodec/motionpixels.c libavcodec/rpza.c libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fraps: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * rpza: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * motionpixels: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * vmdvideo: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3': vmnc: use the AVFrame API properly. xan: use the AVFrame API properly. xxan: use the AVFrame API properly. zerocodec: use the AVFrame API properly. Conflicts: libavcodec/vmnc.c libavcodec/xan.c libavcodec/xxan.c See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56 See: ad438f450b83882a1277a79c1c3d6dfe55573b1c See: 67607e20e882eb5639a4e9099caecb52a863ab68 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vmnc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
| * xan: use the AVFrame API properly.Anton Khirnov2013-11-16
| |