summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * mov: Change DTS-based seek into CTS-based seek.Yusuke Nakamura2015-02-151-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | CTS-based seek is reasonable since player requests frames in output order not coded order. This change fixes seek to a keyframe within consecutive keyframes. Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS respectively, and both two frames are a keyframe. If you try to seek on PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This is obviously undesirable. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '51ca3cb604a7585a7cff35d4b954794508955c19'Michael Niedermayer2015-02-150-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '51ca3cb604a7585a7cff35d4b954794508955c19': xcbgrab: Use the correct geometry for the region highlight See: 0ae37e460c345a4c76e28256af56931e00c94cb5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Use the correct geometry for the region highlightDaniel Moran2015-02-151-1/+1
| | | | | | | | | | | | | | The feature is implemented using a transparent window and drawing inside it a rectangle filling the whole window to highlight it. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'Michael Niedermayer2015-02-151-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6': ape: Use the proper variable type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ape: Use the proper variable typeLuca Barbato2015-02-151-1/+1
| | | | | | | | | | | | | | Avoid an unsigned underflow. Bug-Id: 1041122 CC: libav-stable@libav.org
* | Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'Michael Niedermayer2015-02-150-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'b4cda0a999facbddacb95861a67ff61074edc39b': ogg: check memory allocations Conflicts: libavformat/oggenc.c See: 0f629823355680802320ee7be52af7f4e1b3e0b3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: check memory allocationsFederico Tomassetti2015-02-151-0/+2
| | | | | | | | | | | | | | Bug-Id: CID 1257795 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '53367b34e1156614e82ef7af888928f322566f88'Michael Niedermayer2015-02-151-9/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '53367b34e1156614e82ef7af888928f322566f88': rtp: h264: Drop the asserts Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: h264: Drop the assertsLuca Barbato2015-02-151-9/+0
| |
* | Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'Michael Niedermayer2015-02-151-39/+39
|\ \ | |/ | | | | | | | | | | * commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7': rtp: h264: Move FU-A NAL parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: h264: Move FU-A NAL parsing to a functionLuca Barbato2015-02-151-39/+39
| |
* | Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'Michael Niedermayer2015-02-151-54/+61
|\ \ | |/ | | | | | | | | | | * commit 'f0a87479960ce000f23f2beaf474707797b4b0d0': rtp: h264: Move STAP-A NAL parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: h264: Move STAP-A NAL parsing to a functionLuca Barbato2015-02-151-54/+61
| |
* | Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'Michael Niedermayer2015-02-151-45/+55
|\ \ | |/ | | | | | | | | | | * commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b': rtp: h264: Move parse_sprop_parameter_sets parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: h264: Move parse_sprop_parameter_sets parsing to a functionLuca Barbato2015-02-151-45/+55
| |
* | Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'Michael Niedermayer2015-02-151-25/+31
|\ \ | |/ | | | | | | | | | | * commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c': rtp: h264: Move profile_level_id parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: h264: Move profile_level_id parsing to a functionLuca Barbato2015-02-151-25/+31
| |
* | Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'Michael Niedermayer2015-02-151-6/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42': xcbgrab: Correctly make shm optional Conflicts: libavdevice/xcbgrab.c See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Correctly make shm optionalLuca Barbato2015-02-151-4/+4
| | | | | | | | | | The segment field in the struct has to be conditionally build as well.
* | Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'Michael Niedermayer2015-02-150-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff': xcbgrab: Check for xcb-shape Conflicts: configure See: 792f0f20456cc24f1f1b9ee445e50737d65e38df Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Check for xcb-shapeLuca Barbato2015-02-151-1/+1
| | | | | | | | It is required.
* | Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148'Michael Niedermayer2015-02-152-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e21d85309943a51b7808f5e01dd258b262e09148': FATE: add a test for the SVQ1 header byte swapping Conflicts: tests/fate/qt.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add a test for the SVQ1 header byte swappingAnton Khirnov2015-02-152-0/+8
| |
* | Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'Michael Niedermayer2015-02-151-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e': changelog: mention DXVA/HEVC and AAC ELD480 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * changelog: mention DXVA/HEVC and AAC ELD480Anton Khirnov2015-02-151-0/+2
| |
* | avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"Michael Niedermayer2015-02-151-1/+1
| | | | | | | | | | Found-by: Loriker Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec: DV depacketizer (RFC 6469)Thomas Volkert2015-02-156-1/+173
| | | | | | | | | | | | Tested with live555 RTSP server Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: fix wrong indentationReynaldo H. Verdejo Pinochet2015-02-151-1/+1
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: decouple assignment and checkReynaldo H. Verdejo Pinochet2015-02-151-2/+6
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: break too-long linesReynaldo H. Verdejo Pinochet2015-02-151-25/+51
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: reorder HTTP fwd declsReynaldo H. Verdejo Pinochet2015-02-151-2/+2
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | x86/swr: make pack_8ch functions work with compilers without aligned stackJames Almer2015-02-152-14/+31
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/vc1: cleanup and simplificationzhaoxiu.zeng2015-02-151-112/+97
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtpdec: experimental VP9 depacketizer (draft 0)Thomas Volkert2015-02-156-0/+322
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Creating new data stream for output format contextAnshul Maheshwari2015-02-151-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> if input codec Id match with expected data stream of output format context then only new stream with same codec id is created. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Move remaining tables to dcadata.hMichael Niedermayer2015-02-152-89/+89
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vsrc_mandelbrot: fix indention of mis-indented blockMichael Niedermayer2015-02-151-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use avpriv_find_start_code() in h264_split()Zhaoxiu Zeng2015-02-151-16/+19
| | | | | | | | | | | | | | | | This also allows replacing several literal numbers by named constants And it should be faster, the function is not speed relevant though as it is generally only called a few times at the streams start. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: add allow_raw_vfw and disable it by defaultMichael Niedermayer2015-02-151-2/+12
| | | | | | | | | | | | Based on complaint by wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/fixed_dsp: Use av_clip_int16() instead of the non optimized ↵Michael Niedermayer2015-02-151-2/+2
| | | | | | | | | | | | av_clip_int16_c() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'Michael Niedermayer2015-02-142-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f': vdpau: Adjust necessary #includes for vdpau_internal.h Conflicts: libavcodec/vdpau_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Adjust necessary #includes for vdpau_internal.hDiego Biurrun2015-02-142-2/+4
| |
* | Merge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'Michael Niedermayer2015-02-140-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f': mov: Fix compilation with DEBUG enabled See: 349a32c436d9511fe786c761cc2728f5b5efea0e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Fix compilation with DEBUG enabledDiego Biurrun2015-02-141-2/+2
| |
* | Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'Michael Niedermayer2015-02-142-89/+89
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664': dca: Move all tables into dcadata.h Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move all tables into dcadata.hDiego Biurrun2015-02-142-89/+89
| |
* | Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'Michael Niedermayer2015-02-141-146/+1
|\ \ | |/ | | | | | | | | | | * commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3': dca: Remove trace debugging code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove trace debugging codeDiego Biurrun2015-02-141-146/+1
| |
* | Merge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'Michael Niedermayer2015-02-141-6/+6
|\ \ | |/ | | | | | | | | | | * commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa': dca: Return more informative error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Return more informative error codesDiego Biurrun2015-02-141-6/+6
| |
OpenPOWER on IntegriCloud