]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 19 Nov 2014 19:24:06 +0000 (20:24 +0100)]
Merge commit '
f918b8a2933a65020cbe490ec637d5485c11a692 '
* commit '
f918b8a2933a65020cbe490ec637d5485c11a692 ':
hdsenc: Use the right filename in an error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 18:59:44 +0000 (19:59 +0100)]
avformat/avienc: write last frame duration
Fixes small part of Ticket 3052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 18:30:49 +0000 (19:30 +0100)]
avformat/avienc: factor frame skip code out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 18:24:39 +0000 (19:24 +0100)]
ffmpeg: skip duration cliping for passthrough & drop modes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 19 Nov 2014 18:54:48 +0000 (19:54 +0100)]
doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image
Less likely to change, and under our control.
Thanks-to: Michael Niedermayer
Michael Niedermayer [Wed, 19 Nov 2014 16:21:04 +0000 (17:21 +0100)]
ffmpeg: Check duration for overlap and clip in fps cfr/vfr code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 14:44:42 +0000 (15:44 +0100)]
ffmpeg: Use input packet duration in vfr/cfr code if available and valid
Fixes Ticket3052
Michael Niedermayer [Wed, 19 Nov 2014 12:42:46 +0000 (13:42 +0100)]
avcodec/twinvq: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 12:42:46 +0000 (13:42 +0100)]
avcodec/tta: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 12:42:46 +0000 (13:42 +0100)]
avcodec/truemotion2: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 11:42:05 +0000 (12:42 +0100)]
ffmpeg: fix printed timestamp for droped frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 18 Nov 2014 12:16:41 +0000 (14:16 +0200)]
hdsenc: Use the right filename in an error message
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Tue, 18 Nov 2014 09:36:16 +0000 (10:36 +0100)]
lavf/concatdec: add timestamp log
Help debugging timestamp conversion issues.
Michael Niedermayer [Wed, 19 Nov 2014 02:10:12 +0000 (03:10 +0100)]
ffmpeg: better CFR frame duplication selection
This improves the handling of cases where the frame duration is not known
Fixes Ticket 4119
Fixes Ticket 1578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Nov 2014 02:05:09 +0000 (03:05 +0100)]
ffmpeg: fix variable type for end char
fixes warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dedicatedbroadcastsolutions [Tue, 18 Nov 2014 21:43:07 +0000 (13:43 -0800)]
avformat/mpegtsenc: change the min value for mpegts_start_pid to allow ATSC PIDs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Tue, 18 Nov 2014 19:02:58 +0000 (13:02 -0600)]
dashenc: degrade gracefully if a stream's bitrate is unavailable
If a stream's bitrate is not set, this attempts to use its rc_max_rate;
if neither is set, it avoids writing a bandwidth attribute at all.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 18 Nov 2014 20:10:29 +0000 (21:10 +0100)]
doc/writing_filters: fix reference to Lenna image
Clément Bœsch [Tue, 18 Nov 2014 20:09:38 +0000 (21:09 +0100)]
doc/writing_filters: use a more portable sed command in the walk-through
Michael Niedermayer [Tue, 18 Nov 2014 19:33:37 +0000 (20:33 +0100)]
Merge commit '
7813e6752bdab38a5686c301e869ee71d97bce69 '
* commit '
7813e6752bdab38a5686c301e869ee71d97bce69 ':
configure: Fix enabling memalign_hack automatically
Conflicts:
configure
See:
3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Hall [Tue, 18 Nov 2014 15:17:42 +0000 (15:17 +0000)]
avcodec/libvorbisenc: Give CODEC_CAP_SMALL_LAST_FRAME to libvorbis encoder.
The libvorbis encoder already supports a small last frame, but the layer
above doesn't know that because we didn't register the small last frame
capability.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vadim Kalinsky [Wed, 12 Nov 2014 17:25:45 +0000 (12:25 -0500)]
avcodec/options: Set AVCodecContext->codec upon initialization.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 18 Nov 2014 11:52:26 +0000 (13:52 +0200)]
configure: Fix enabling memalign_hack automatically
simd_align_16 is a configure item that can be enabled or disabled,
it's not a variable containing a list of other configure items
as need_memalign previously. This was broken in
eba2233b5 .
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Tue, 18 Nov 2014 06:12:38 +0000 (03:12 -0300)]
lavf/ffmenc: fix memleak in ffm_write_header
Regression since
745730c9c208c40f800d5d71ffa39aceab6ce044 .
The dynamic buffer was not being used or freed.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Simon Thelen [Tue, 18 Nov 2014 12:29:27 +0000 (13:29 +0100)]
doc/filters: use '|' instead of ':' in the documentation.
Using colons to separate the outdefs is deprecated. Switch to using '|'
to separate the list items.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 11:24:41 +0000 (12:24 +0100)]
avfilter/af_volume: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 11:24:16 +0000 (12:24 +0100)]
avfilter/af_amix: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Nov 2014 12:37:45 +0000 (13:37 +0100)]
avcodec/nellymoser: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 10:52:17 +0000 (11:52 +0100)]
doc/APIchanges: Fix some wrong versions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Nov 2014 13:39:45 +0000 (14:39 +0100)]
avutil/float_dsp: add avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 10:33:00 +0000 (11:33 +0100)]
libavcodec/tiffenc: Use av_freep() avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 10:33:00 +0000 (11:33 +0100)]
libavcodec/libxavs: Use av_freep() avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 10:33:00 +0000 (11:33 +0100)]
libavcodec/libx264: Use av_freep() avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 04:10:21 +0000 (05:10 +0100)]
avcodec/mjpegdec: Support some subsampled GBR variants
Fixes Ticket4045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 03:04:37 +0000 (04:04 +0100)]
avformat/mp3dec: avoid seeking to negative positions
Fixes Ticket4038
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 02:42:40 +0000 (03:42 +0100)]
avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order or operations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 02:33:35 +0000 (03:33 +0100)]
Merge commit '
2007082d2db25f9305b8a345798b840ea7784fdb '
* commit '
2007082d2db25f9305b8a345798b840ea7784fdb ':
mov: check ff_get_wav_header() return value
Conflicts:
libavformat/mov.c
See:
6d55a40b00801899f7975b22401bdd96bbc228af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 02:16:38 +0000 (03:16 +0100)]
Merge commit '
85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa '
* commit '
85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa ':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 02:08:20 +0000 (03:08 +0100)]
Merge commit '
771656bd85416cd6308b11aed6f2c69a8db9c21b '
* commit '
771656bd85416cd6308b11aed6f2c69a8db9c21b ':
libvpxenc: clean memory on error
Conflicts:
libavcodec/libvpxenc.c
See:
104b1d9e103f90485e894b20dd5bb3f1964fe5f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 01:55:23 +0000 (02:55 +0100)]
Merge commit '
a28468d0daf4be14761c16a3ddd33266b2380123 '
* commit '
a28468d0daf4be14761c16a3ddd33266b2380123 ':
librtmp: append the correct field to the string
See:
d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Nov 2014 01:38:38 +0000 (02:38 +0100)]
Merge commit '
9257692ac15eff7b07540c1f61cebde0d8823fbd '
* commit '
9257692ac15eff7b07540c1f61cebde0d8823fbd ':
lavf: Only initialize s->offset once when using avoid_negative_ts make_zero
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 16 Nov 2014 23:22:23 +0000 (00:22 +0100)]
mov: check ff_get_wav_header() return value
CC: libav-stable@libav.org
Bug-Id: CID 717497
Vittorio Giovara [Sun, 16 Nov 2014 23:22:27 +0000 (00:22 +0100)]
lavc: fix bitshifts amount bigger than the type
CC: libav-stable@libav.org
Bug-Id: CID
1194387 / CID
1194389 / CID
1194393 / CID
1206638
Vittorio Giovara [Sun, 16 Nov 2014 23:22:28 +0000 (00:22 +0100)]
libvpxenc: clean memory on error
CC: libav-stable@libav.org
Bug-Id: CID 733795
Vittorio Giovara [Sun, 16 Nov 2014 23:22:22 +0000 (00:22 +0100)]
librtmp: append the correct field to the string
Also prevent a NULL pointer dereference.
CC: libav-stable@libav.org
Bug-Id: CID
1250329 / CID
1250331
Michael Niedermayer [Sat, 18 Oct 2014 21:24:23 +0000 (23:24 +0200)]
avdevice/oss_audio: avoid strerror() and errbuf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 22:09:22 +0000 (23:09 +0100)]
Merge commit '
c302d034ba2690a935df8bf7e4f5d44ed86e8d5c '
* commit '
c302d034ba2690a935df8bf7e4f5d44ed86e8d5c ':
tools: Add a sidxindex tool
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 22:02:02 +0000 (23:02 +0100)]
Merge commit '
40ed1cbf147d09fc0894bee160f0b6b6d9159fc5 '
* commit '
40ed1cbf147d09fc0894bee160f0b6b6d9159fc5 ':
movenc: Allow writing a DASH sidx atom at the start of files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 21:23:48 +0000 (22:23 +0100)]
Merge commit '
3847f3ab58b3b74604807394247bf68827258103 '
* commit '
3847f3ab58b3b74604807394247bf68827258103 ':
movenc: Add tfra entries for all tracks in a moof
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 17 Nov 2014 11:31:47 +0000 (13:31 +0200)]
lavf: Only initialize s->offset once when using avoid_negative_ts make_zero
When given a stream starting at dts=0, it would previously consider
s->offset as uninitialized and set an offset when the second packet
was written, ending up writing two packets with dts=0. By initializing
this field to AV_NOPTS_VALUE, we make sure that we only initialize it
once, on the first packet.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 17 Nov 2014 21:07:11 +0000 (22:07 +0100)]
Merge commit '
fe5e6e34c05e274f98528be4f77f3c474473f977 '
* commit '
fe5e6e34c05e274f98528be4f77f3c474473f977 ':
lavf: Add an MPEG-DASH ISOFF segmenting muxer
Conflicts:
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 20:55:23 +0000 (21:55 +0100)]
Merge commit '
2ded57371abead879bcee56da5131e5fac0d17ef '
* commit '
2ded57371abead879bcee56da5131e5fac0d17ef ':
movenc: Add support for writing sidx atoms for DASH segments
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 20:43:31 +0000 (21:43 +0100)]
Merge commit '
2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8 '
* commit '
2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8 ':
movenc: Factorize adding fragment info into a separate function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 20:21:38 +0000 (21:21 +0100)]
Merge commit '
0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6 '
* commit '
0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6 ':
movenc: Include empty tracks in iods when writing fragmented mp4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 19:58:21 +0000 (20:58 +0100)]
avcodec/lcldec: support rgb24 with width%4 != 0
Fixes Ticket1216
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 17 Nov 2014 16:54:32 +0000 (17:54 +0100)]
Read (display) aspect ratio from mxf files.
Fixes ticket #4107.
Martin Storsjö [Wed, 29 Oct 2014 09:43:34 +0000 (11:43 +0200)]
tools: Add a sidxindex tool
This tool can write an MPD file for fragmented MP4 files with
a sidx index at the start of the file.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 21 Oct 2014 08:42:27 +0000 (11:42 +0300)]
movenc: Allow writing a DASH sidx atom at the start of files
This is mapped to the faststart flag (which in this case
perhaps should be called "shift and write index at the
start of the file"), which for fragmented files will
write a sidx index at the start.
When segmenting DASH into files, there's usually one sidx
at the start of each segment (although it's not clear to me
whether that actually is necessary). When storing all of it
in one file, the MPD doesn't necessarily need to describe
the individual segments, but the offsets of the fragments can be
fetched from one large sidx atom at the start of the file. This
allows creating files for the DASH ISO BMFF on-demand profile.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 12 Oct 2014 20:49:22 +0000 (23:49 +0300)]
movenc: Add tfra entries for all tracks in a moof
Previously only tfra entries were added for the first track in each moof.
The frag_info array used for tfra can also be used for writing
other kinds of fragment indexes, where it's more important to
include all tracks.
When the separate_moof option is enabled (as in ismv), we write
a separate moof for each track, so this doesn't make any difference
in that case.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 6 Oct 2014 08:36:17 +0000 (11:36 +0300)]
lavf: Add an MPEG-DASH ISOFF segmenting muxer
This is mostly to serve as a reference example on how to segment
the output from the mp4 muxer, capable of writing the segment
list in four different ways:
- SegmentTemplate with SegmentTimeline
- SegmentTemplate with implicit segments
- SegmentList with individual files
- SegmentList with one single file per track, and byte ranges
The muxer is able to serve live content (with optional windowing)
or create a static segmented MPD.
In advanced cases, users will probably want to do the segmenting
in their own application code.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 5 Oct 2014 20:51:47 +0000 (23:51 +0300)]
movenc: Add support for writing sidx atoms for DASH segments
A flag "dash" is added, which enables the necessary flags for
creating DASH compatible fragments.
When this is enabled, one sidx atom is written for each track
before every moof atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
Matthew Oliver [Mon, 17 Nov 2014 10:03:13 +0000 (21:03 +1100)]
configure: Enable mpcodec compilation without inline asm.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Oliver [Wed, 5 Nov 2014 06:26:15 +0000 (17:26 +1100)]
mpcodecs: Use _INLINE guards for inline asm.
Enabled compilation with compiler without inline asm support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 12 Oct 2014 20:37:17 +0000 (23:37 +0300)]
movenc: Factorize adding fragment info into a separate function
By calling this after writing the moof the first time (for
calculating the moof size), we can avoid intermediate storage
of tfrf_offset in MOVTrack.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 3 Nov 2014 21:44:02 +0000 (23:44 +0200)]
movenc: Include empty tracks in iods when writing fragmented mp4
When writing fragmented streams with an empty initial moov,
we won't have any samples in any tracks when writing the
moov atom, thus trust that any tracks that are added actually
will be present.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 17 Nov 2014 12:08:05 +0000 (13:08 +0100)]
avformat/flvenc: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 12:00:10 +0000 (13:00 +0100)]
Merge commit '
c64f3615118d757dcf76040fe5407bf2b3883206 '
* commit '
c64f3615118d757dcf76040fe5407bf2b3883206 ':
flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 11:43:55 +0000 (12:43 +0100)]
Merge commit '
4d0cd5f58c892276716f46f4b2702915e5018215 '
* commit '
4d0cd5f58c892276716f46f4b2702915e5018215 ':
flvenc: move metadata updates into a single function
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 11:24:38 +0000 (12:24 +0100)]
Merge commit '
8b573ddda75980f724f779ff75aacc2ff81d9e0e '
* commit '
8b573ddda75980f724f779ff75aacc2ff81d9e0e ':
hevc: remove superfluous assignments and checks
Conflicts:
libavcodec/hevc.c
See:
83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 11:12:55 +0000 (12:12 +0100)]
Merge commit '
eac3ac1fe0774b65316852616b2672702dbc3f31 '
* commit '
eac3ac1fe0774b65316852616b2672702dbc3f31 ':
hevc: eliminate an unneeded intermediate variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 11:07:49 +0000 (12:07 +0100)]
Merge commit '
eb335f3c5ce37f2b93c993e28404d113bee843bc '
* commit '
eb335f3c5ce37f2b93c993e28404d113bee843bc ':
hevc: reduce variable scope
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 11:01:47 +0000 (12:01 +0100)]
Merge commit '
84c0ece5fd9569c0f31804f02a199ecd0e7d13d8 '
* commit '
84c0ece5fd9569c0f31804f02a199ecd0e7d13d8 ':
hevc: further reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 10:54:41 +0000 (11:54 +0100)]
Merge commit '
a7b365ae191f45a0d7ed7b34033d5d0cbdd47139 '
* commit '
a7b365ae191f45a0d7ed7b34033d5d0cbdd47139 ':
hevc: reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 10:41:35 +0000 (11:41 +0100)]
Merge commit '
de1f8ead8993512925a3ee6c7491473414419e55 '
* commit '
de1f8ead8993512925a3ee6c7491473414419e55 ':
hevcdsp_template: templatize transquant_bypass
Conflicts:
libavcodec/hevcdsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 10:30:41 +0000 (11:30 +0100)]
Merge commit '
16c01fb4347312b6d29a6498dad627665b96a20e '
* commit '
16c01fb4347312b6d29a6498dad627665b96a20e ':
hevc: remove an unused function parameter
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 10:27:12 +0000 (11:27 +0100)]
Michael Niedermayer [Mon, 17 Nov 2014 10:20:32 +0000 (11:20 +0100)]
Merge commit '
2c6a7f9348378f887066fb1669c46b9485e8ef3e '
* commit '
2c6a7f9348378f887066fb1669c46b9485e8ef3e ':
hevc: do not store rqt_root_cbf in the context
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 10:05:58 +0000 (11:05 +0100)]
Merge commit '
920bca3e2332dced9c78bd14cfc2ff138188bd57 '
* commit '
920bca3e2332dced9c78bd14cfc2ff138188bd57 ':
hevc: do not store pcm_flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Stone [Fri, 7 Nov 2014 21:09:10 +0000 (16:09 -0500)]
flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Fri, 7 Nov 2014 21:09:09 +0000 (16:09 -0500)]
flvenc: move metadata updates into a single function
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 16 Nov 2014 07:23:19 +0000 (08:23 +0100)]
hevc: remove superfluous assignments and checks
Anton Khirnov [Sun, 16 Nov 2014 07:15:42 +0000 (08:15 +0100)]
hevc: eliminate an unneeded intermediate variable
Anton Khirnov [Sun, 16 Nov 2014 07:13:46 +0000 (08:13 +0100)]
hevc: reduce variable scope
Also, collapse the array into a scalar, since only one value is needed
at a time.
Anton Khirnov [Sun, 16 Nov 2014 07:06:27 +0000 (08:06 +0100)]
hevc: further reduce code duplication in hls_prediction_unit()
Anton Khirnov [Sun, 16 Nov 2014 07:02:18 +0000 (08:02 +0100)]
hevc: reduce code duplication in hls_prediction_unit()
Anton Khirnov [Sat, 15 Nov 2014 21:31:27 +0000 (22:31 +0100)]
hevcdsp_template: templatize transquant_bypass
Anton Khirnov [Sat, 15 Nov 2014 20:18:51 +0000 (21:18 +0100)]
hevc: remove an unused function parameter
Anton Khirnov [Sat, 15 Nov 2014 19:40:12 +0000 (20:40 +0100)]
hevc: remove a redundant line
pred_mode is overwritten a few lines immediately below.
Anton Khirnov [Sat, 15 Nov 2014 19:00:22 +0000 (20:00 +0100)]
hevc: do not store rqt_root_cbf in the context
It does not need to be accessed outside of hls_coding_unit().
Anton Khirnov [Sat, 15 Nov 2014 19:00:22 +0000 (20:00 +0100)]
hevc: do not store pcm_flag in the context
It does not need to be accessed outside of hls_coding_unit().
Michael Niedermayer [Mon, 17 Nov 2014 03:25:01 +0000 (04:25 +0100)]
ffmpeg: Fix last newline at log level less than "info"
Fixes Ticket3058
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Nov 2014 03:06:32 +0000 (04:06 +0100)]
cmdutils: Exit in case of faulty stream specifiers
Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 16 Nov 2014 01:15:58 +0000 (02:15 +0100)]
ffserver_config: fix possible crash
Fixes CID #
1254662
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 15 Nov 2014 01:21:04 +0000 (02:21 +0100)]
ffserver_config: do not store preset name
Preset are translated to AVOptions.
It is not required to reparse anymore.
Fixes CID #
1254667
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Reynaldo H. Verdejo Pinochet [Sun, 16 Nov 2014 23:12:29 +0000 (20:12 -0300)]
ffserver: drop pointless explicit !=0 checks
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Michael Niedermayer [Sun, 16 Nov 2014 22:34:40 +0000 (23:34 +0100)]
avcodec/roqvideoenc: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Nov 2014 22:34:40 +0000 (23:34 +0100)]
avcodec/snow: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Nov 2014 22:34:40 +0000 (23:34 +0100)]
avcodec/rl2: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Nov 2014 18:17:34 +0000 (19:17 +0100)]
avformat/mpeg: fix memleak of sub_name on error
Fixes CID1254666
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Nov 2014 18:01:10 +0000 (19:01 +0100)]
avdevice/xcbgrab: Fix/remove unneeded NULL checks
Fixes CID1254664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>