summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264PictureMichael Niedermayer2014-03-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vaapi: fix pointer types after H264Picture changesMichael Niedermayer2014-03-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-16
| |
* | Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | * commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d': h264: Remove MotionEstContext and move the relevant fields to H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Remove MotionEstContext and move the relevant fields to H264ContextVittorio Giovara2014-03-16
| | | | | | | | Unused buffers scratchpad and temp have been dropped too.
* | Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c': h264: Replace mpegvideo-specific MAX_THREADS by private define Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_THREADS by private defineVittorio Giovara2014-03-16
| |
* | Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara2014-03-16
| |
* | avcodec/h264: h264_set_erpic() clear destinationMichael Niedermayer2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move relevant fields from Picture to H264PictureVittorio Giovara2014-03-16
| |
* | avcodec/error_resilience: fix the case when MVs are not availableMichael Niedermayer2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: ff_mpeg_set_erpic() clear destinationMichael Niedermayer2014-03-17
| | | | | | | | | | | | Fixes crash Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * er: move relevant fields from Picture to ERPictureVittorio Giovara2014-03-16
| | | | | | | | | | | | | | This is done to disentangle ER from mpegvideo. In order to use a classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function to set the fields. Please note that buffers need to be allocated before calling ff_er_frame_end().
* | Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | * commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e': h264: directly use frames in ff_h264_draw_horiz_band() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: directly use frames in ff_h264_draw_horiz_band()Vittorio Giovara2014-03-16
| |
* | Merge commit '75af13a'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '75af13a': mpegvideo: directly use frames in ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: directly use frames in ff_draw_horiz_band()Vittorio Giovara2014-03-16
| |
* | avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()Matt Oliver2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: be more tolerant on what pixel format changes trigger reinitsMichael Niedermayer2014-03-17
| | | | | | | | | | | | Fixes Ticket3260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add missing external declarations.Matt Oliver2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fixed 64bit conformance with mvzbl.Matt Oliver2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/x86/swscale: remove unused constantsMichael Niedermayer2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * qatar/master: aacdec: Lower the number of frames required to detect ADTS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Lower the number of frames required to detect ADTSMartin Storsjö2014-03-16
| | | | | | | | | | | | | | | | | | | | | | For live audio streams, requiring 500 frames for a stream to be detected is a bit overkill. This allows live ADTS streams that don't start nicely at a frame boundary to start up more quickly, e.g. http://mp3.streampower.be/radio1.aac. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932': aacdec: Don't count probed ADTS frames if there are false positives Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Don't count probed ADTS frames if there are false positivesMartin Storsjö2014-03-16
| | | | | | | | | | | | | | | | | | If a portion of the probe buffer seem to resemble ADTS frames, but some data at the end is a mismatch, disregard the whole probing attempt. If it actually is ADTS data, there shouldn't be any mismatches within the sequential frame data. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Changelog: move post 2.2 branching entries out of the 2.2 changelogMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Phantom Cine demuxer (iteration 2014.3)Peter Ross2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where ↵Peter Ross2014-03-16
| | | | | | | | | | | | | | | | | | | | | | bits_per_coded_sample < 16 The bit packing method is communicted via codec_tag: BIT[0] big-endian packing BIT[16] 16-bit little endian packing BIT[32] 32-bit little-endian packing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)Jasper Taylor2014-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this filter mode is to allow interlaced content to display properly in interlaced video modes, as described in http://forum.xbmc.org/showthread.php?tid=81834 and https://github.com/mpv-player/mpv/issues/624#issuecomment-37685195 . The filter doubles the video frame rate, but does not work properly because: (1) it does not set the properties of the output stream to indicate the doubled frame rate, and (2) it does not set an appropriate PTS on the extra frames. The attached patch fixes these problems by settling these values the same way they are set in vf_yadif mode 1 (field) which also doubles the frame rate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: omit avformat ident from isml_manifest for bitexact modeMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tagMichael Niedermayer2014-03-16
| | | | | | | | | | | | This code is apparently not tested by fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: only ommit encoder tag of the metadata for bitexact modeMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: check that a subtitle encoder is available before auto mapping ↵Michael Niedermayer2014-03-16
| | | | | | | | | | | | | | | | streams Fixes Ticket3470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | | | | | | | * qatar/master: FATE: add a test for the ONE_STR mapping mode of the channelmap filter Conflicts: tests/fate/filter-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add a test for the ONE_STR mapping mode of the channelmap filterAnton Khirnov2014-03-16
| |
* | Merge commit 'e843612695007cc623813073754c651ab43021f7'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit 'e843612695007cc623813073754c651ab43021f7': af_channelmap: fix ONE_STR mapping mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: fix ONE_STR mapping modeAnton Khirnov2014-03-16
| | | | | | | | | | | | get_channel() returns 0 on success CC:libav-stable@libav.org
* | avformat/isom: fix mix of declaration and statementMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit '8f629a986c46f227abda1811a6ad1f449871ca35': isom: convert mp4 dvdsub extradata to vobsub format Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: convert mp4 dvdsub extradata to vobsub formatwm42014-03-15
| | | | | | | | | | | | | | | | | | | | | | | | mp4 files embedding DVD subtitles do not use the same extradata format as the rest of Libav expects. The subtitle decoder in libavcodec in particular does not understand this format. Convert the extradata to the vobsub .idx format. mp4 stores the palette as binary 32 bit ints in YUV. The subtitle resolution is stored separately in the track header, which we access through AVStream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffmpeg: fix printing INT64_MIN pts at the endMichael Niedermayer2014-03-16
| | | | | | | | | | | | Fixes Ticket3427 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()Michael Niedermayer2014-03-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Check ist is valid before using it in audio_channels_map initMichael Niedermayer2014-03-15
| | | | | | | | | | | | | | Fixes segfault and instead provides an error message Fixes Ticket3465 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: dont use direct mode for unaligned inputMichael Niedermayer2014-03-15
| | | | | | | | | | | | Fixes Ticket3456 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Move STRIDE_ALIGN to internal.hMichael Niedermayer2014-03-15
| | | | | | | | | | | | The next commit/bugfix will need it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 20:38:20 +0000