* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a':
libavformat: Use ffio_free_dyn_buf where applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8a273a746061a112e5e35066a8fd8e146d821a62':
avio: Add an internal utility function for freeing dynamic buffers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '078d43e23a7a3d64aafee8a58b380d3e139b3020':
rtpdec: Free depacketizers if the init function failed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'bb4a310bb85f43e62240145a656b1e5285b14239':
rtpdec: Don't free the payload context in the .free function
Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
rtpdec: Use .init instead of .alloc to set default values
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
rtpdec_hevc: Share the implementation of fragmented packets with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f3449062a8d100ac4f703647336c32b126aa99f1':
rtpdec_hevc: Reduce indentation level by returning early on errors
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
rtpdec_hevc: Share the implementation of parsing a=framesize with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684':
rtpdec_hevc: Add asterisks at the start of each long comment line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd':
rtpdec: Allow allocating and freeing the private data without explicit functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6':
rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Incidentally `-y` also collides with avconv global options.
Update x11grab to match and document the option.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
rtpdec_mpa_robust: Move .enc_name to the start of the struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202':
rtpdec: Change enc_name to a pointer instead of a fixed-size buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Many of these functions were named foo_free_context, and since
the functions no longer should free the context itself, only
allocated elements within it, the previous naming was slightly
misleading.
Signed-off-by: Martin Storsjö <martin@martin.st>
This is different from how it is handled in codecs/demuxers/muxers
though (where the close function isn't called if the open function
failed), but since the number of depacketizers that have an .init
function is quite limited, this is easy to change.
The main point is that if the init function failed, we shouldn't
try to use that depacketizer at all - this makes sure that the
parse function doesn't need to check for the things that were
initialized in the init function.
Signed-off-by: Martin Storsjö <martin@martin.st>
This makes it more consistent with depacketizers that don't have any
.free function at all, where the payload context is freed by the
surrounding framework. Always free the context in the surrounding
framework, having the individual depacketizers only free any data
they've specifically allocated themselves.
This is similar to how this works for demuxer/muxers/codecs - a
component shouldn't free the priv_data that the framework has
allocated for it.
Signed-off-by: Martin Storsjö <martin@martin.st>
* commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c':
rtsp: Fix the indentation of a linewrapped statement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA
See: afb0e5a810
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Update the filter option documentation text to link to ffmpeg-utils
documentation for video size syntax description.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Using the copy codec ACLR atoms where incorrectly written
During the creation of the ACLR atom we are assuming the vos_data
contains the DNxHD header. This change makes this explicit and
ensures we don't over write the stream with the extra_data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer
Luca Barbato
John Stebbins
Martin Storsjö
Tobias Rapp
Kevin Wheatley