summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* dnxhdenc: do not select 4:4:4 profilesChristophe Gisquet2015-10-051-1/+1
| | | | | | The encoder can only deal with 4:2:2. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: profile flagsChristophe Gisquet2015-10-052-18/+37
| | | | | | | Move the 'interlaced' flag to this element (arbitrarily set to 16bits). This should allow better detection/selection of profiles. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhddec: cleanup frame header parsingChristophe Gisquet2015-10-051-27/+27
| | | | | | | Rely more on the actual syntax from the specs (also seen in the encoder code). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mmaldec: Use av_assert0() instead of assert()Michael Niedermayer2015-10-051-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8'Hendrik Leppkes2015-10-051-2/+14
|\ | | | | | | | | | | | | * commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8': mmaldec: be more tolerant against MMAL not returning decoded output Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: be more tolerant against MMAL not returning decoded outputwm42015-10-041-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations, MMAL won't return a decoded frame for certain input frames. This can happen if a frame fails to decode, or if a packet does not actually contain a complete frame. In these situations, we would deadlock (or actually timeout) waiting for an expected output frame, which is not ideal. On the other hand, there are situations where we definitely have to block to avoid deadlocks. (This mess is a consequence of trying to map MMAL's asynchronous and flexible dataflow to libavcodec, which is more static and rigid.) Solve this by doing a blocking wait only if the amount of buffered data is too big. The whole purpose of the blocking wait is to avoid excessive buffering of input data, so we can skip it if it appears to be low. The consequence is that libavcodec can gracefully return no frame to the API user. We want to track the number of full packets to make our heuristic work. But MMAL buffers are fixed-size, requiring splitting large packets. This is why the previous commit is needed. We use the ..._FRAME_END flag to remember packet boundaries, but MMAL does not preserve these buffer flags when returning buffers to the user. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '65db4899fa8790049bec3af16ecdb75dd81051fd'Hendrik Leppkes2015-10-051-9/+10
|\ \ | |/ | | | | | | | | | | * commit '65db4899fa8790049bec3af16ecdb75dd81051fd': mmaldec: refactor to have more context per MMAL input buffer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: refactor to have more context per MMAL input bufferwm42015-10-041-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The next commit needs 1 bit of additional information per MMAL buffer sent to the MMAL input port. This information will be needed when the buffer is recycled (i.e. returned by the input port's callback). Normally, we could use MMAL_BUFFER_HEADER_FLAG_USER0, but that is unexpectedly not preserved. Do this by storing a pointer to FFBufferEntry in the MMAL buffer's user data, instead of an AVBufferRef. This also changes the lifetime of FFBufferEntry. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'eae58428bd199f7d4670bf471f56ed204430878e'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'eae58428bd199f7d4670bf471f56ed204430878e': avcodec: Do not lock during open for codecs marked as having threadsafe init Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avcodec: Do not lock during open for codecs marked as having threadsafe initDerek Buitenhuis2015-10-041-17/+21
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'Hendrik Leppkes2015-10-051-2/+4
|\ \ | |/ | | | | | | | | | | * commit 'abe9adfb31566c415fd830a8d4977c79512d4385': rangecoder: Use AV_RB16 instead of bytestream_get_be16 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rangecoder: Use AV_RB16 instead of bytestream_get_be16Vittorio Giovara2015-10-041-2/+4
| | | | | | | | | | | | | | | | Silence an incompatible-pointer-types-discards-qualifiers warning from clang. rangecoder.c:58:34: warning: passing 'uint8_t **' (aka 'unsigned char **') to parameter of type 'const uint8_t **' (aka 'const unsigned char **') discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]
* | Merge commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b': hevc: Simplify logical check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hevc: Simplify logical checkVittorio Giovara2015-10-041-1/+1
| | | | | | | | | | | | The intended meaning is "if this block is the first block in a slice then its left boundary is a slice boundary". Silence a logical-not-parentheses warning from gcc.
* | Merge commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15': h264: Use the correct argument context in debug log Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Use the correct argument context in debug logVittorio Giovara2015-10-041-1/+1
| |
* | Merge commit '4628443ca3534060888dd0015b229337eac13fd2'Hendrik Leppkes2015-10-051-2/+2
|\ \ | |/ | | | | | | | | | | * commit '4628443ca3534060888dd0015b229337eac13fd2': h263: Drop uninitialized variable use from log message Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h263: Drop uninitialized variable use from log messageVittorio Giovara2015-10-041-2/+2
| |
* | Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'Hendrik Leppkes2015-10-051-4/+5
|\ \ | |/ | | | | | | | | | | * commit '1da2a20763ae9ca579d5fd20763065871ddf6311': dvbsubdec: Fix function return type Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dvbsubdec: Fix function return typeVittorio Giovara2015-10-041-1/+2
| |
* | Merge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'Hendrik Leppkes2015-10-052-8/+9
|\ \ | |/ | | | | | | | | | | * commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2': dv: Mark internal frame reference as const Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dv: Mark internal frame reference as constVittorio Giovara2015-10-042-7/+8
| | | | | | | | | | | | Silence a warning due to frame assignment in dvenc. All uses of the reference in dvdec are read only, except the ones in the main decoding function, so use the frame pointer directly there.
* | Merge commit '4c160fa23996c05efcd952ccfac2359311d8a1bc'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit '4c160fa23996c05efcd952ccfac2359311d8a1bc': dcadec: Always initialize return variable Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dcadec: Always initialize return variableVittorio Giovara2015-10-041-1/+1
| | | | | | | | Silence an uninitialized warning from clang.
* | Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'Hendrik Leppkes2015-10-052-1/+12
|\ \ | |/ | | | | | | | | | | * commit 'bb198c4997d5036f3bf91de51e44f807115677d0': d3d11va: make av_d3d11va_alloc_context() available at all times Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * d3d11va: make av_d3d11va_alloc_context() available at all timesAnton Khirnov2015-10-032-1/+12
| | | | | | | | The public API should not depend on the build configuration.
* | Merge commit 'f3202871598f59b570b31b01cfeb64b8fedbd700'Hendrik Leppkes2015-10-051-0/+5
|\ \ | |/ | | | | | | | | | | * commit 'f3202871598f59b570b31b01cfeb64b8fedbd700': d3d11va: check for malloc failure Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * d3d11va: check for malloc failureAnton Khirnov2015-10-031-0/+5
| |
* | Merge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915': avutil/avstring: Inline some tiny functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avutil/avstring: Inline some tiny functionsHenrik Gramner2015-10-032-26/+18
| | | | | | | | | | | | | | They're short enough that inlining them actually reduces code size due to all the overhead associated with making a function call. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'Hendrik Leppkes2015-10-051-1/+3
|\ \ | |/ | | | | | | | | | | * commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae': matroskaenc: Don't write a track language tag Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * matroskaenc: Don't write a track language tagJohn Stebbins2015-10-031-1/+3
| | | | | | | | | | | | | | | | | | "language" is not an offical matroska tag. Track languages are specified with the MATROSKA_ID_TRACKLANGUAGE ebml. Writing the tag overrides the ebml specified language during playback with libav and some other players. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8bb376cf6b4ab8645daedb8becaa7163656436a4'Hendrik Leppkes2015-10-050-0/+0
|\ \ | |/ | | | | | | | | | | * commit '8bb376cf6b4ab8645daedb8becaa7163656436a4': checkasm: Fix the function name sorting algorithm Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm: Fix the function name sorting algorithmHenrik Gramner2015-10-031-2/+6
| | | | | | | | | | | | The previous implementation was behaving incorrectly in some corner cases. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffserver: avoid leaking pathname at exitReynaldo H. Verdejo Pinochet2015-10-041-0/+1
| | | | | | | | | | | | Fixes Coverity CID 1325681 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: fix up rate units in server messagesReynaldo H. Verdejo Pinochet2015-10-041-5/+5
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: wrap around bandwidth exceeded msg textReynaldo H. Verdejo Pinochet2015-10-041-3/+5
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: wrap around too-busy message textReynaldo H. Verdejo Pinochet2015-10-041-2/+4
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: unify exit path in _write_index()Reynaldo H. Verdejo Pinochet2015-10-041-2/+6
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: fix line wrapping on function declsReynaldo H. Verdejo Pinochet2015-10-041-3/+4
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffplay: more robust mutex creationGanesh Ajjanagadde2015-10-051-0/+6
| | | | | | | | | | | | | | | | | | SDL_CreateMutex can fail: https://wiki.libsdl.org/SDL_CreateMutex. This patch makes creation more robust in one instance. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | concatdec: fix metadata memleak on errorMarton Balint2015-10-051-5/+5
| | | | | | | | | | | | | | Fixes Coverity CID 1323077. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* | libavformat/tls_securetransport: fix argument evalulation order UBRodger Combs2015-10-041-4/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/tta: Un-break build without threadsMichael Niedermayer2015-10-041-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add displace video filterPaul B Mahol2015-10-046-2/+453
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/alacdec: split off decorrelate_stereo and append_extra_bits as alacdspJames Almer2015-10-044-41/+115
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec: use HAVE_THREADS header guards to silence -Wunused-functionGanesh Ajjanagadde2015-10-0417-0/+40
| | | | | | | | | | | | | | | | | | | | When compiled with --disable-pthreads, e.g http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7, a bunch of -Wunused-functions are reported due to missing header guards around threading related functions. This patch should silence such warnings. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | all: add _DEFAULT_SOURCE locally wherever neededGanesh Ajjanagadde2015-10-043-0/+3
| | | | | | | | | | | | | | | | | | Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE. The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros. This solution is on the lines of the one in commit af1818276ef271af98e2e2bbabb4dc875b4fa7d8. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | ffplay: more robust thread creationGanesh Ajjanagadde2015-10-041-4/+12
| | | | | | | | | | | | | | | | | | SDL_CreateThread can fail: https://wiki.libsdl.org/SDL_CreateThread. This patch makes thread creation more robust in one instance. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | Changelog: add note on ffplay dynamic volume controlGanesh Ajjanagadde2015-10-041-0/+1
| | | | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
OpenPOWER on IntegriCloud