aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavfi/subtitles: set a different description between ass and subtitles.Clément Bœsch2013-02-171-2/+2
|
* lavfi: rename vf_ass.c to vf_subtitles.cClément Bœsch2013-02-172-2/+2
|
* lavfi/subtitles: support charenc option.Clément Bœsch2013-02-172-1/+11
|
* lavfi/subtitles: split options between ass and subtitles.Clément Bœsch2013-02-171-8/+14
|
* lavc: support subtitles character encoding conversion.Clément Bœsch2013-02-176-5/+131
|
* lavc: mark bitmap based subtitles codecs as such.Clément Bœsch2013-02-173-1/+9
|
* lavfi/mp: drop mp=kerndeint filterStefano Sabatini2013-02-175-350/+1
| | | | The filter has been natively integrated into libavfilter.
* lavfi/mp: drop mp=unsharp filterStefano Sabatini2013-02-175-330/+1
| | | | | The native filter is equivalent from the point of view of the features and of performances.
* lavfi/unsharp: add missing NULL checkStefano Sabatini2013-02-171-1/+2
|
* lavfi/unsharp: merge definition and declaration in init_filter_param()Stefano Sabatini2013-02-171-3/+1
|
* lavfi/unsharp: directly access in-loop variables in apply_unsharp()Stefano Sabatini2013-02-171-14/+19
| | | | Increase performance, to match mp=unsharp.
* lavfi/unsharp: add check on matrix x/y size values oddityStefano Sabatini2013-02-173-7/+21
|
* Changelog: Add entry for encrypted TTA stream decodingJames Almer2013-02-171-0/+1
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/tta: Use a safer check for encrypted streamsJames Almer2013-02-171-1/+1
| | | | | | | | | The user can provide a password even when the stream is not encrypted, so check the value of s->format instead of s->pass in ttafilter_init(). Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: don't initialize missing pictures when using a hwaccelHendrik Leppkes2013-02-171-1/+1
| | | | | | Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu: Fix checkheaders for x86/emms.hJames Almer2013-02-171-0/+1
| | | | | | | | internal.h doesn't need to include cpu.h anymore since the relevant code was moved to x86/emms.h Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-1635-1792/+2255
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: deMpegEncContextizeAnton Khirnov2013-02-1534-1718/+2162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau <janne-libav@jannau.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'Michael Niedermayer2013-02-1612-62/+84
|\| | | | | | | | | | | | | | | | | | | * commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885': mpegvideo: split ff_draw_horiz_band(). Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: split ff_draw_horiz_band().Anton Khirnov2013-02-1512-62/+84
| | | | | | | | Split out dependency on MpegEncContext.
* | Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'Michael Niedermayer2013-02-1615-339/+450
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '54974c62982ae827becdbdb9b620b7ba75d079a0': error_resilience: decouple ER from MpegEncContext Conflicts: libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: decouple ER from MpegEncContextAnton Khirnov2013-02-1515-335/+431
| |
* | Changelog: add missing empty line after the version lineStefano Sabatini2013-02-161-0/+1
| |
* | Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'Michael Niedermayer2013-02-162-188/+183
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc': svq3: remove a pointless if() h264: remove a pointless if() Conflicts: libavcodec/h264.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: remove a pointless if()Anton Khirnov2013-02-151-122/+120
| | | | | | | | The H264 context is always uninitialized at this point.
| * h264: remove a pointless if()Anton Khirnov2013-02-151-65/+63
| | | | | | | | !encoding is always true, we do not have a H.264 encoder
* | Merge commit '68f930d2188aba5b32624887dcbf688c23482834'Michael Niedermayer2013-02-161-10/+8
|\| | | | | | | | | | | | | | | | | | | * commit '68f930d2188aba5b32624887dcbf688c23482834': h264: simplify calls to ff_er_add_slice(). Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: simplify calls to ff_er_add_slice().Anton Khirnov2013-02-151-10/+8
| | | | | | | | partitioned_frame is never set for h264 (as easily seen from git grep).
* | cinepack: print an error if cinepak_decode() failedMichael Niedermayer2013-02-161-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yadif: remove unused variableMichael Niedermayer2013-02-161-1/+0
| | | | | | | | | | Found by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer2013-02-162-6/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * get_buffer(): do not initialize the data.Anton Khirnov2013-02-152-6/+0
| | | | | | | | | | There may be more decoders that rely on this. Those should be found and fixed.
* | h264: color frames grayMichael Niedermayer2013-02-161-0/+8
| | | | | | | | | | | | | | This prevents a regression from the removial of the buffer initialization Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add avpriv_color_frame()Michael Niedermayer2013-02-162-0/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: port MP noise filterPaul B Mahol2013-02-168-9/+423
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mpegvideo_enc: draw edges on inputMichael Niedermayer2013-02-161-3/+12
| | | | | | | | | | | | Improves Motion estimation, avoids using out of picture areas for %16 != 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'Michael Niedermayer2013-02-165-133/+198
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82': vf_yadif: fix out-of line reads Conflicts: libavfilter/vf_yadif.c tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_yadif: fix out-of line readsAnton Khirnov2013-02-155-112/+200
| | | | | | | | Some changes in the border pixels, visually indistinguishable.
* | Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'Michael Niedermayer2013-02-161-14/+12
|\| | | | | | | | | | | | | | | | | | | * commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13': vf_yadif: factorize initializing the filtering callbacks Conflicts: libavfilter/vf_yadif.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_yadif: factorize initializing the filtering callbacksAnton Khirnov2013-02-151-11/+12
| | | | | | | | Do it all in config_props().
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-02-161-60/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: only display frames if there are no pending events ffplay: remove remains of video_clock ffplay: remove refresh thread to achieve more precise frame delay Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: only display frames if there are no pending eventsMarton Balint2013-02-151-7/+6
| | | | | | | | | | | | | | | | | | | | | Otherwise events could just pile up if displaying a frame takes more time than the duration of the frame. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: remove remains of video_clockMarton Balint2013-02-151-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | We are now using a pts based approach, libavutil/libavcodec should provide the correct pts-es anyway. This also fixes an issue when seeking to a frame with a pts set to zero. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: remove refresh thread to achieve more precise frame delayMarton Balint2013-02-151-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a refresh loop which displays the frames and also does the polling for pending events in a non-blocking way. If we know the required delay until the next frame, then exactly that amount of sleeping will be done. After each handled event we check if we have to display a frame which kind of makes displaying the frame a high priority event. This improves greatly the smoothness of the video output especially with 50fps content. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | lavfi/yadif: support 9, 12, and 14 bits per pixelJames Darnley2013-02-161-0/+9
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavfi/yadif: remove unnecessary castJames Darnley2013-02-161-1/+1
| | | | | | | | | | | | | | | | | | Finish what 99162f8 started Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavfi/kerndeint: move is_rgb_packed definition to the internal contextStefano Sabatini2013-02-161-1/+3
| | | | | | | | | | | | No need to recompute it for each new frame.
* | | lavfi/kerndeint: use aligned linesizes for the temporary buffer.Clément Bœsch2013-02-161-5/+10
| | | | | | | | | | | | | | | | | | This improves the performances just enough to match mp=kerndeint. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | | lavfi/unsharp: extend range for amount values, to reflect the behavior of ↵Stefano Sabatini2013-02-163-9/+13
| | | | | | | | | | | | | | | | | | mp=unsharp Also update the documentation accordingly, and suggest a meaningful range.
* | | doc/filters: itemize unsharp examplesStefano Sabatini2013-02-161-5/+9
| | | | | | | | | | | | Also drop pointless example.