OSDN Git Service
Clément Bœsch [Wed, 30 Oct 2013 14:50:36 +0000 (15:50 +0100)]
doc/examples/demuxing: show how to use the reference counting system.
Michael Niedermayer [Mon, 4 Nov 2013 10:50:47 +0000 (11:50 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:41:55 +0000 (11:41 +0100)]
Merge commit '
da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
* commit '
da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
lavc: move AVCodecContext.pkt to AVCodecInternal
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:14:38 +0000 (11:14 +0100)]
Merge commit '
38ecc3702dabbea09230f6d6333f59e74f5d1c12'
* commit '
38ecc3702dabbea09230f6d6333f59e74f5d1c12':
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
Conflicts:
libavcodec/internal.h
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:05:52 +0000 (11:05 +0100)]
Merge commit '
daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
* commit '
daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
pthread_slice: rename ThreadContext -> SliceThreadContext
Conflicts:
libavcodec/pthread_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 09:44:34 +0000 (10:44 +0100)]
Merge commit '
cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
* commit '
cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
lavc: split slice and frame threading functions into separate files
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 08:54:42 +0000 (09:54 +0100)]
Merge commit '
5cd6513f5be14b9744783d3d9e853d3f11065e93'
* commit '
5cd6513f5be14b9744783d3d9e853d3f11065e93':
pthread: drop avcodec_ prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 08:48:11 +0000 (09:48 +0100)]
Merge commit '
694d997afe07ec619e61e1c614733796dd01a52b'
* commit '
694d997afe07ec619e61e1c614733796dd01a52b':
x86: hpeldsp: Use PAVGB instruction macro where necessary
See:
074155360d28d25701e0cbc7e867bda0e08d9428
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gian-Carlo Pascutto [Sun, 3 Nov 2013 10:42:47 +0000 (12:42 +0200)]
aacdec: Set the profile during decoding
Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 27 Oct 2013 12:12:53 +0000 (13:12 +0100)]
lavc: move AVCodecContext.pkt to AVCodecInternal
It's a private field, not meant to be accessed from outside lavc.
Anton Khirnov [Sun, 27 Oct 2013 12:00:37 +0000 (13:00 +0100)]
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
It's a private field, it should not be visible to callers.
Deprecate AVCodecContext.thread_opaque
Anton Khirnov [Sun, 27 Oct 2013 11:31:38 +0000 (12:31 +0100)]
pthread_slice: rename ThreadContext -> SliceThreadContext
This should prevent confusion with frame threading.
Anton Khirnov [Sun, 27 Oct 2013 11:22:52 +0000 (12:22 +0100)]
lavc: split slice and frame threading functions into separate files
Anton Khirnov [Sun, 27 Oct 2013 11:03:05 +0000 (12:03 +0100)]
pthread: drop avcodec_ prefixes from static functions
Ronald S. Bultje [Mon, 4 Nov 2013 00:42:30 +0000 (19:42 -0500)]
Put vp9_scans and vp9_scans_nb in ro_data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 01:08:43 +0000 (02:08 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse: add ff_ prefix and fix param type
lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mikulas Patocka [Sun, 3 Nov 2013 19:37:11 +0000 (20:37 +0100)]
x86: hpeldsp: Use PAVGB instruction macro where necessary
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Mon, 4 Nov 2013 00:20:46 +0000 (01:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Remove redundant OBJS declaration intended for programs
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 3 Nov 2013 23:34:18 +0000 (00:34 +0100)]
lavd/pulse: add ff_ prefix and fix param type
Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Fri, 1 Nov 2013 14:10:56 +0000 (15:10 +0100)]
lavd/pulse_audio_enc: fix flush return code
Successful flushing is reported by returning 1 instead of 0.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
wm4 [Sun, 3 Nov 2013 17:17:45 +0000 (18:17 +0100)]
http: add hack to make streams served by MediaGateway not seekable
These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:
content-range: bytes 0-
1999999999/
2000000000
Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:
Server: MediaGateway 3.5.2-001
Add a hack that checks the server name, and disables seeking in this
case.
Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 21:11:11 +0000 (22:11 +0100)]
avcodec/ffv1enc: Check high bpp RGB against coder type too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 20:26:40 +0000 (21:26 +0100)]
avformat/utils: never decrease has_b_frames in compute_pkt_fields()
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values
Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mikulas Patocka [Sun, 3 Nov 2013 17:00:17 +0000 (18:00 +0100)]
avcodec/x86/hpeldsp: fix crash on AMD K6-3+
There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.
livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.
As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.
This bug seems to be introduced by commit
71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 2 Nov 2013 14:53:43 +0000 (15:53 +0100)]
build: Remove redundant OBJS declaration intended for programs
Stefano Sabatini [Sun, 3 Nov 2013 09:50:16 +0000 (10:50 +0100)]
ffmpeg: add verbose consistency checks in case of filtering inconsistent options
In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.
Stefano Sabatini [Sun, 3 Nov 2013 12:36:24 +0000 (13:36 +0100)]
lavc: remove dead FF_API_OLD_TIMECODE API
Stefano Sabatini [Sun, 3 Nov 2013 12:34:08 +0000 (13:34 +0100)]
lavc: remove dead FF_API_AVCODEC_OPEN API
Stefano Sabatini [Sun, 3 Nov 2013 12:32:34 +0000 (13:32 +0100)]
lavc: remove dead FF_API_ALLOC_CONTEXT API
Paul B Mahol [Sun, 3 Nov 2013 16:39:22 +0000 (16:39 +0000)]
avfilter/vf_aspect: remove dupe constants setup
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 3 Nov 2013 13:45:18 +0000 (14:45 +0100)]
MAINTAINERS: add vp9 maintainers
Suggested-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 12:57:01 +0000 (13:57 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/af_pan: support unknown layouts on input.
lavfi/af_pan: support unknown layouts on output.
lswr: fix assert failure on unknown layouts.
lavfi: parsing helper for unknown channel layouts.
lavfi/avfiltergraph: do not reduce incompatible lists.
lavfi/avfiltergraph: suggest a solution when format selection fails.
lavd/lavfi: support unknown channel layouts.
lavf/wavenc: check for a single stream.
lavd/alsa: add stream validation
lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 12:07:42 +0000 (13:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmpproto: Reorder conditions to help dead code elimination
See:
23e9e5c7d9048cb463c4de9e518994aa5d651445
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 3 Nov 2013 12:12:58 +0000 (13:12 +0100)]
lavc/version.h: remove empty line
Stefano Sabatini [Thu, 31 Oct 2013 09:38:10 +0000 (10:38 +0100)]
lavc: drop deprecated audio_convert API at the next major bump
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Sun, 3 Nov 2013 12:00:10 +0000 (13:00 +0100)]
avcodec/ansi: set w/h correctly at the top
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 11:58:54 +0000 (12:58 +0100)]
Merge commit '
3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
* commit '
3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
ansi: fix possible use of uninitialized variables
Conflicts:
libavcodec/ansi.c
Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 11:48:04 +0000 (12:48 +0100)]
Merge commit '
c0bba95c2363641d3297b3852b2ece1474cda295'
* commit '
c0bba95c2363641d3297b3852b2ece1474cda295':
wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 11:37:54 +0000 (12:37 +0100)]
Merge commit '
5858a67f135a7395c548482c73cf3d39bcdd3022'
* commit '
5858a67f135a7395c548482c73cf3d39bcdd3022':
attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 11:23:01 +0000 (12:23 +0100)]
Merge commit '
3a14b160bd442794c6a16a6a883adb547550e847'
* commit '
3a14b160bd442794c6a16a6a883adb547550e847':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See:
61d55fda2b513caf18e37b27aba680a87840904a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 10:36:16 +0000 (11:36 +0100)]
Merge commit '
34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
* commit '
34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
vf_aspect: support variables in evaluating the aspect ratios
Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 3 Nov 2013 09:50:00 +0000 (10:50 +0100)]
rtmpproto: Reorder conditions to help dead code elimination
This makes sure that these branches are eliminated properly
with clang with optimizations disabled.
Vittorio Giovara [Sun, 27 Oct 2013 17:14:02 +0000 (18:14 +0100)]
ansi: fix possible use of uninitialized variables
Vittorio Giovara [Sun, 27 Oct 2013 17:05:19 +0000 (18:05 +0100)]
wtv: fix variable sign in format
Vittorio Giovara [Sat, 26 Oct 2013 23:45:18 +0000 (01:45 +0200)]
attributes: disable flatten on llvm/clang
Nicolas George [Fri, 25 Oct 2013 14:12:06 +0000 (16:12 +0200)]
lavfi/af_pan: support unknown layouts on input.
Fix trac ticket #2899.
Nicolas George [Fri, 25 Oct 2013 14:02:04 +0000 (16:02 +0200)]
lavfi/af_pan: support unknown layouts on output.
Nicolas George [Fri, 25 Oct 2013 14:11:30 +0000 (16:11 +0200)]
lswr: fix assert failure on unknown layouts.
Nicolas George [Fri, 25 Oct 2013 13:07:40 +0000 (15:07 +0200)]
lavfi: parsing helper for unknown channel layouts.
Make ff_parse_channel_layout() accept unknown layouts too.
Nicolas George [Tue, 3 Sep 2013 20:13:49 +0000 (22:13 +0200)]
lavfi/avfiltergraph: do not reduce incompatible lists.
A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
Nicolas George [Tue, 3 Sep 2013 20:12:54 +0000 (22:12 +0200)]
lavfi/avfiltergraph: suggest a solution when format selection fails.
Format selection can fail if unknown channel layouts are used
with filters that do not support it.
Nicolas George [Mon, 28 Oct 2013 10:50:09 +0000 (11:50 +0100)]
lavd/lavfi: support unknown channel layouts.
Nicolas George [Sat, 2 Nov 2013 15:23:26 +0000 (16:23 +0100)]
lavf/wavenc: check for a single stream.
Fix trac ticket #3110.
Lukasz Marek [Fri, 25 Oct 2013 23:32:55 +0000 (01:32 +0200)]
lavd/alsa: add stream validation
Don't trust provided streams.
Return with error when stream count is not 1 or
provided stream is not an audio stream.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Fri, 25 Oct 2013 23:19:31 +0000 (01:19 +0200)]
lavd/alsa: fix timestamp calculation
Current implementation didn't include duration of
last processed packet.
Device may return negative timestamps without
this correction.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sun, 3 Nov 2013 00:53:19 +0000 (01:53 +0100)]
avcodec/hevc_sei: Fix null dereference in decode_pic_timing()
Fixes Ticket3106
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 01:07:31 +0000 (02:07 +0100)]
avcodec/hevc_sei: check active_seq_parameter_set_id validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 00:07:07 +0000 (01:07 +0100)]
mpegvideo: reduce whitespace differences to libav
This excludes many changes that worsen readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 00:07:07 +0000 (01:07 +0100)]
h264: reduce whitespace differences to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Sat, 2 Nov 2013 23:28:56 +0000 (00:28 +0100)]
libvpxenc: allow qmax of 0
this is valid for both vp8 & vp9 and necessary for lossless in the
latter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 2 Nov 2013 22:03:30 +0000 (15:03 -0700)]
avutil/xtea: add Doxy @file and group
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 2 Nov 2013 22:03:15 +0000 (15:03 -0700)]
avutil/adler32: add Doxy group
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Sat, 2 Nov 2013 23:20:19 +0000 (00:20 +0100)]
libvpxenc: add VP9 options
same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Sat, 2 Nov 2013 23:28:18 +0000 (00:28 +0100)]
MAINTAINERS: add myself for libvpx*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 21:27:32 +0000 (22:27 +0100)]
ffv1enc: store 2pass statistics at the end
This reduces their size from O(n) to O(1)
Fixes Ticket3078
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 21:52:19 +0000 (22:52 +0100)]
avcodec/ffv1enc: pass through pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rudolf Polzer [Sat, 2 Nov 2013 10:57:25 +0000 (11:57 +0100)]
vf_scale: make the dar variable return the DAR.
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rudolf Polzer [Sat, 2 Nov 2013 10:57:24 +0000 (11:57 +0100)]
vf_aspect: support variables in evaluating the aspect ratios
Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Zern [Sat, 2 Nov 2013 19:09:01 +0000 (20:09 +0100)]
libvpxenc: split vp8/vp9 options array
the current options are left for both to provide command line compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 2 Nov 2013 02:43:24 +0000 (19:43 -0700)]
avcodec/libmp3lame: add ABR support
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 17:37:14 +0000 (18:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
os_support: Add #endif comments for better readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 17:31:41 +0000 (18:31 +0100)]
Merge commit '
c68d4c230ad8ca85af3999a6af8e582c43620d58'
* commit '
c68d4c230ad8ca85af3999a6af8e582c43620d58':
mpeg4video_parser: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 14:47:48 +0000 (15:47 +0100)]
avcodec/hevc: add "apply_defdispwin" alias for compatibilty with
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: whitespaces to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: random cosmetics to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: indention related cosmetics to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: cosmetics to reduce diff to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce whitespace differences to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 2 Nov 2013 11:00:42 +0000 (12:00 +0100)]
os_support: Add #endif comments for better readability
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce bracket differences to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 10:43:43 +0000 (11:43 +0100)]
avcodec/hevc: more whitespaces to reduce difference to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 28 Oct 2013 17:31:10 +0000 (18:31 +0100)]
mpeg4video_parser: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sat, 2 Nov 2013 09:37:03 +0000 (10:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)]
Merge commit '
dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
* commit '
dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
mpeg4video: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 09:19:12 +0000 (10:19 +0100)]
Merge commit '
037fea388e0df2a22441bc1ed86794152161baf1'
* commit '
037fea388e0df2a22441bc1ed86794152161baf1':
flashsv: K&R formatting cosmetics
Conflicts:
libavcodec/flashsv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 09:11:35 +0000 (10:11 +0100)]
Merge commit '
1700b4e678ed329611a16b20d11e64b7abda4839'
* commit '
1700b4e678ed329611a16b20d11e64b7abda4839':
x86: vp8dsp: Split loopfilter code into a separate file
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 09:02:12 +0000 (10:02 +0100)]
Merge commit '
056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'
* commit '
056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f':
configure: Properly check for availability of -Wno-foo warning flags
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 08:55:40 +0000 (09:55 +0100)]
Merge commit '
23157d72b565e0228fec97f1eb059d4f8021a260'
* commit '
23157d72b565e0228fec97f1eb059d4f8021a260':
configure: Split test_cflags function off from check_cflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 15 Aug 2013 13:06:52 +0000 (16:06 +0300)]
Add an HDS live fragmenting muxer
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 2 Nov 2013 08:48:34 +0000 (09:48 +0100)]
Merge commit '
d1c229cdbc07ef8eb703d68d1c5b509baee85245'
* commit '
d1c229cdbc07ef8eb703d68d1c5b509baee85245':
lavf: do not use int to store an int64
Conflicts:
libavformat/utils.c
See:
ad56535dd1d7204ea0958decac15e8dfc86162ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 08:39:51 +0000 (09:39 +0100)]
Merge commit '
57070b1468edc6ac8cb3696c817f3c943975d4c1'
* commit '
57070b1468edc6ac8cb3696c817f3c943975d4c1':
flashsv: Check diff_start diff_height values
Conflicts:
libavcodec/flashsv.c
See:
880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 08:31:50 +0000 (09:31 +0100)]
Merge commit '
4a64e67988dd01005efb1ae831bff14c1656b573'
* commit '
4a64e67988dd01005efb1ae831bff14c1656b573':
flashsv: Refactor a little
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 01:37:29 +0000 (02:37 +0100)]
h264_refs: use named constant for setting frame_recovered
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Nov 2013 00:02:21 +0000 (01:02 +0100)]
h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Nov 2013 23:31:49 +0000 (00:31 +0100)]
avcodec/hevc: Adjust white-spaces to reduce difference to
064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Thu, 31 Oct 2013 22:51:08 +0000 (23:51 +0100)]
hevc: fix temporal_id(cherry picked from commit
5eac0df49d33bef7f3ffc5efde19839dddb554e8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 28 Oct 2013 17:31:07 +0000 (18:31 +0100)]
mpeg4video: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Luca Barbato [Thu, 31 Oct 2013 09:27:02 +0000 (10:27 +0100)]
flashsv: K&R formatting cosmetics
Also improve some log message wording/spelling.
Signed-off-by: Diego Biurrun <diego@biurrun.de>