OSDN Git Service

android-x86/external-ffmpeg.git
12 years agolavc: update pkt_duration for skipped samples.
Nicolas George [Sun, 15 Jul 2012 14:24:59 +0000 (16:24 +0200)]
lavc: update pkt_duration for skipped samples.

Also: factor the the computation of the timestamp difference.

12 years agoRevert "ffmpeg: set pkt_timebase"
Nicolas George [Sun, 15 Jul 2012 14:09:01 +0000 (16:09 +0200)]
Revert "ffmpeg: set pkt_timebase"

This reverts commit 744bd8d08c18d68d92ead091c7e335b4b07459aa.

pkt_timebase is now set by av_codec_set_pkt_timebase.
If some demuxer set AVStream.time_base directly,
it need to be fixed. There is a warning to detect it.

12 years agolavf: set pkt_timebase at the same time as stream->time_base.
Nicolas George [Sun, 15 Jul 2012 14:04:44 +0000 (16:04 +0200)]
lavf: set pkt_timebase at the same time as stream->time_base.

12 years agolavc: warn when impossible to adjust timestamps for skipped samples.
Nicolas George [Sun, 15 Jul 2012 12:37:27 +0000 (14:37 +0200)]
lavc: warn when impossible to adjust timestamps for skipped samples.

It is likely to happen if pkt_timebase was not set.

12 years agolavc: add debug info about skipped samples.
Nicolas George [Sun, 15 Jul 2012 12:36:22 +0000 (14:36 +0200)]
lavc: add debug info about skipped samples.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Jul 2012 21:31:04 +0000 (23:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (38 commits)
  alac: cosmetics: general pretty-printing and comment clean up
  alac: calculate buffer size outside the loop in allocate_buffers()
  alac: change some data types to plain int
  alac: cosmetics: rename some variables and function names
  alac: multi-channel decoding support
  alac: split element parsing into a separate function
  alac: support a read sample size of up to 32
  alac: output in planar sample format
  alac: add 32-bit decoding support
  alac: simplify channel interleaving
  alac: use AVPacket fields directly in alac_decode_frame()
  alac: fix check for valid max_samples_per_frame
  alac: use get_sbits() to read LPC coefficients instead of casting
  alac: move the current samples per frame to the ALACContext
  alac: avoid using a double-negative when checking if the frame is compressed
  alac: factor out output_size check in predictor_decompress_fir_adapt()
  alac: factor out loading of next decoded sample in LPC prediction
  alac: use index into buffer_out instead of incrementing the pointer
  alac: simplify lpc coefficient adaptation
  alac: reduce the number of local variables needed in lpc prediction
  ...

Conflicts:
libavcodec/alac.c
libavformat/cafdec.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not...
Stefano Sabatini [Wed, 18 Jul 2012 14:33:24 +0000 (16:33 +0200)]
lavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not supported

They are only supported if pthread is available.

12 years agodoc/protocols: add a note regarding the circular RX UDP buffer
Stefano Sabatini [Wed, 18 Jul 2012 14:56:11 +0000 (16:56 +0200)]
doc/protocols: add a note regarding the circular RX UDP buffer

12 years agodoc/protocols: apply misc fixes to the UDP protocol section
Stefano Sabatini [Wed, 18 Jul 2012 14:13:51 +0000 (16:13 +0200)]
doc/protocols: apply misc fixes to the UDP protocol section

12 years agodoc/protocols: extend/clarify documentation for the buffer_size UDP option
Stefano Sabatini [Wed, 18 Jul 2012 16:38:01 +0000 (18:38 +0200)]
doc/protocols: extend/clarify documentation for the buffer_size UDP option

12 years agodoc/protocols: document "fifo_size" and "overrun_nonfatal" UDP options
Stefano Sabatini [Sun, 15 Jul 2012 18:56:08 +0000 (20:56 +0200)]
doc/protocols: document "fifo_size" and "overrun_nonfatal" UDP options

Address trac ticket #1511.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Jul 2012 19:58:09 +0000 (21:58 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Print full compiler identification, not only version number
  flacdec: reverse lpc coeff order, simplify filter
  x86: dsputil: drop some unused CPU flag debug code

Conflicts:
cmdutils.c
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoalac: cosmetics: general pretty-printing and comment clean up
Justin Ruggles [Mon, 9 Jul 2012 21:02:42 +0000 (17:02 -0400)]
alac: cosmetics: general pretty-printing and comment clean up

12 years agoalac: calculate buffer size outside the loop in allocate_buffers()
Justin Ruggles [Mon, 9 Jul 2012 20:57:22 +0000 (16:57 -0400)]
alac: calculate buffer size outside the loop in allocate_buffers()

12 years agoalac: change some data types to plain int
Justin Ruggles [Mon, 9 Jul 2012 20:56:34 +0000 (16:56 -0400)]
alac: change some data types to plain int

12 years agoalac: cosmetics: rename some variables and function names
Justin Ruggles [Mon, 9 Jul 2012 20:52:19 +0000 (16:52 -0400)]
alac: cosmetics: rename some variables and function names

12 years agoalac: multi-channel decoding support
Andrew D'Addesio [Mon, 9 Jul 2012 20:29:49 +0000 (16:29 -0400)]
alac: multi-channel decoding support

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoalac: split element parsing into a separate function
Justin Ruggles [Mon, 9 Jul 2012 20:05:53 +0000 (16:05 -0400)]
alac: split element parsing into a separate function

This will make multi-channel implementation simpler.
Based partially on a patch by Andrew D'Addesio <modchipv12@gmail.com>.

12 years agoalac: support a read sample size of up to 32
Justin Ruggles [Mon, 9 Jul 2012 19:38:58 +0000 (15:38 -0400)]
alac: support a read sample size of up to 32

Use get_bits_long() in decode_scalar().
Use unsigned int for decoded value.

12 years agoalac: output in planar sample format
Justin Ruggles [Mon, 9 Jul 2012 19:18:51 +0000 (15:18 -0400)]
alac: output in planar sample format

Avoids unneeded interleaving and allows for reusing the AVFrame output buffer
as the internal buffer for 24-bit and 32-bit sample size.

12 years agoalac: add 32-bit decoding support
Justin Ruggles [Mon, 9 Jul 2012 18:36:03 +0000 (14:36 -0400)]
alac: add 32-bit decoding support

12 years agoalac: simplify channel interleaving
Andrew D'Addesio [Mon, 9 Jul 2012 18:34:41 +0000 (14:34 -0400)]
alac: simplify channel interleaving

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoalac: use AVPacket fields directly in alac_decode_frame()
Justin Ruggles [Mon, 9 Jul 2012 17:30:03 +0000 (13:30 -0400)]
alac: use AVPacket fields directly in alac_decode_frame()

12 years agoalac: fix check for valid max_samples_per_frame
Justin Ruggles [Mon, 9 Jul 2012 17:23:22 +0000 (13:23 -0400)]
alac: fix check for valid max_samples_per_frame

12 years agoalac: use get_sbits() to read LPC coefficients instead of casting
Justin Ruggles [Mon, 9 Jul 2012 17:19:10 +0000 (13:19 -0400)]
alac: use get_sbits() to read LPC coefficients instead of casting

12 years agoalac: move the current samples per frame to the ALACContext
Justin Ruggles [Mon, 9 Jul 2012 17:15:35 +0000 (13:15 -0400)]
alac: move the current samples per frame to the ALACContext

This will simplify the multi-channel implementation.

12 years agoalac: avoid using a double-negative when checking if the frame is compressed
Justin Ruggles [Mon, 9 Jul 2012 17:05:35 +0000 (13:05 -0400)]
alac: avoid using a double-negative when checking if the frame is compressed

12 years agoalac: factor out output_size check in predictor_decompress_fir_adapt()
Justin Ruggles [Mon, 9 Jul 2012 17:01:32 +0000 (13:01 -0400)]
alac: factor out output_size check in predictor_decompress_fir_adapt()

12 years agoalac: factor out loading of next decoded sample in LPC prediction
Justin Ruggles [Mon, 9 Jul 2012 16:57:16 +0000 (12:57 -0400)]
alac: factor out loading of next decoded sample in LPC prediction

12 years agoalac: use index into buffer_out instead of incrementing the pointer
Justin Ruggles [Mon, 9 Jul 2012 16:52:30 +0000 (12:52 -0400)]
alac: use index into buffer_out instead of incrementing the pointer

12 years agoalac: simplify lpc coefficient adaptation
Justin Ruggles [Mon, 9 Jul 2012 15:33:31 +0000 (11:33 -0400)]
alac: simplify lpc coefficient adaptation

12 years agoalac: reduce the number of local variables needed in lpc prediction
Justin Ruggles [Mon, 9 Jul 2012 15:18:21 +0000 (11:18 -0400)]
alac: reduce the number of local variables needed in lpc prediction

12 years agoalac: simplify 1st order prediction and reading of warm-up samples
Justin Ruggles [Mon, 9 Jul 2012 15:12:25 +0000 (11:12 -0400)]
alac: simplify 1st order prediction and reading of warm-up samples

12 years agoalac: cosmetics: reindent after last commit
Justin Ruggles [Mon, 9 Jul 2012 15:08:59 +0000 (11:08 -0400)]
alac: cosmetics: reindent after last commit

12 years agoalac: remove unneeded conditionals in predictor_decompress_fir_adapt()
Justin Ruggles [Mon, 9 Jul 2012 15:07:57 +0000 (11:07 -0400)]
alac: remove unneeded conditionals in predictor_decompress_fir_adapt()

12 years agoalac: use sizeof() instead of hardcoded data sizes
Justin Ruggles [Mon, 9 Jul 2012 15:04:56 +0000 (11:04 -0400)]
alac: use sizeof() instead of hardcoded data sizes

12 years agoalac: make block_size signed
Justin Ruggles [Mon, 9 Jul 2012 15:02:48 +0000 (11:02 -0400)]
alac: make block_size signed

It does not need to be unsigned.

12 years agoalac: remove a duplicate local variable
Justin Ruggles [Mon, 9 Jul 2012 15:00:16 +0000 (11:00 -0400)]
alac: remove a duplicate local variable

12 years agoalac: conditionally set sign_modifier to 1
Justin Ruggles [Mon, 9 Jul 2012 14:57:42 +0000 (10:57 -0400)]
alac: conditionally set sign_modifier to 1

It is already unconditionally set to 0 prior to this, so we can modify it
only when needed.

12 years agoalac: eliminate 2 unneeded local variables in bastardized_rice_decompress()
Justin Ruggles [Mon, 9 Jul 2012 14:53:28 +0000 (10:53 -0400)]
alac: eliminate 2 unneeded local variables in bastardized_rice_decompress()

x_modified is just unnecessary, and final_val can be removed by simplifying
the unsigned-to-signed conversion.

12 years agoalac: adjust conditions for updating entropy decoder history
Justin Ruggles [Mon, 9 Jul 2012 14:42:52 +0000 (10:42 -0400)]
alac: adjust conditions for updating entropy decoder history

avoids some unnecessary arithmetic in certain situations

12 years agoalac: cosmetics: reindent after last commit
Justin Ruggles [Mon, 9 Jul 2012 14:34:11 +0000 (10:34 -0400)]
alac: cosmetics: reindent after last commit

12 years agoalac: limit the rice param before passing to decode_scalar()
Justin Ruggles [Mon, 9 Jul 2012 14:33:28 +0000 (10:33 -0400)]
alac: limit the rice param before passing to decode_scalar()

reduces the number of parameters to decode_scalar() and slightly simplifies
the code

12 years agoalac: reduce the number of parameters to bastardized_rice_decompress()
Justin Ruggles [Mon, 9 Jul 2012 14:30:40 +0000 (10:30 -0400)]
alac: reduce the number of parameters to bastardized_rice_decompress()

Use the ALACContext fields directly instead.

12 years agoalac: cosmetics: rename some ALACContext parameters
Justin Ruggles [Mon, 9 Jul 2012 14:23:47 +0000 (10:23 -0400)]
alac: cosmetics: rename some ALACContext parameters

12 years agoalac: clean up and update comments leftover from reverse-engineering
Justin Ruggles [Mon, 9 Jul 2012 14:10:02 +0000 (10:10 -0400)]
alac: clean up and update comments leftover from reverse-engineering

12 years agoavformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer
Justin Ruggles [Sat, 7 Apr 2012 16:40:50 +0000 (12:40 -0400)]
avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer

12 years agocaf: use int64_t for num_packets
Justin Ruggles [Mon, 9 Jul 2012 18:16:37 +0000 (14:16 -0400)]
caf: use int64_t for num_packets

It is used to store a value read by avio_rb64().

12 years agocaf: fix 'pakt' chunk parsing
Justin Ruggles [Mon, 9 Jul 2012 18:10:52 +0000 (14:10 -0400)]
caf: fix 'pakt' chunk parsing

according to the CAF specification:
"... the value for mChunkSize can be greater than the actual valid content
of the packet table chunk"

12 years agocaf: support either old or new style ALAC magic kuki chunk
Justin Ruggles [Sun, 8 Jul 2012 23:33:10 +0000 (19:33 -0400)]
caf: support either old or new style ALAC magic kuki chunk

12 years agothreads: fix a potential race spotted by helgrind.
Clément Bœsch [Thu, 19 Jul 2012 17:08:31 +0000 (19:08 +0200)]
threads: fix a potential race spotted by helgrind.

12 years agofate/subtitles: sort tests alphabetically.
Clément Bœsch [Thu, 19 Jul 2012 17:07:10 +0000 (19:07 +0200)]
fate/subtitles: sort tests alphabetically.

12 years agomxfdec: simplify code by using av_calloc()
Michael Niedermayer [Wed, 1 Feb 2012 05:05:12 +0000 (06:05 +0100)]
mxfdec: simplify code by using av_calloc()

Reviewed a long time ago by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavidec: Mark first frame as keyframe in case there are no keyframes.
Michael Niedermayer [Mon, 30 Jan 2012 22:52:45 +0000 (23:52 +0100)]
avidec: Mark first frame as keyframe in case there are no keyframes.

This fixes seeking in filecopy.avi of Ticket504

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix misspellings of FFmpeg
Michael Niedermayer [Wed, 18 Jul 2012 20:46:47 +0000 (22:46 +0200)]
Fix misspellings of FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoswscale/input: silence warnings about incompatible pointer types
Paul B Mahol [Thu, 19 Jul 2012 01:07:38 +0000 (01:07 +0000)]
swscale/input: silence warnings about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agoffmpeg: add -(no)stdin option.
Nicolas George [Wed, 11 Jul 2012 19:10:17 +0000 (21:10 +0200)]
ffmpeg: add -(no)stdin option.

Allows to disable interaction from standard input.
Useful, for example, if ffmpeg is in the background process group.
Roughly the same result can be achieved with "ffmpeg ... < /dev/null"
but it requires a shell.

12 years agoffmpeg: invert using_stdin and rename accordingly.
Nicolas George [Sat, 14 Jul 2012 15:52:51 +0000 (17:52 +0200)]
ffmpeg: invert using_stdin and rename accordingly.

There are other reasons not to use stdin than having it as an input.

12 years agoPrint full compiler identification, not only version number
Mans Rullgard [Wed, 18 Jul 2012 16:57:57 +0000 (17:57 +0100)]
Print full compiler identification, not only version number

This provides a more precise identification of the compiler used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoflacdec: reverse lpc coeff order, simplify filter
Mans Rullgard [Thu, 5 Jul 2012 11:25:40 +0000 (12:25 +0100)]
flacdec: reverse lpc coeff order, simplify filter

Reversing the lpc coefficient order simplifies indexing in
the filter.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agox86: dsputil: drop some unused CPU flag debug code
Diego Biurrun [Wed, 18 Jul 2012 07:46:38 +0000 (09:46 +0200)]
x86: dsputil: drop some unused CPU flag debug code

12 years agoswscale: unscaled rgba64->rgb48
Paul B Mahol [Wed, 18 Jul 2012 01:49:52 +0000 (01:49 +0000)]
swscale: unscaled rgba64->rgb48

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agoswscale: unscaled rgba64->bgr48
Paul B Mahol [Wed, 18 Jul 2012 01:34:20 +0000 (01:34 +0000)]
swscale: unscaled rgba64->bgr48

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agoswscale: simplify unscaled rgb48<->bgr48
Paul B Mahol [Wed, 18 Jul 2012 00:09:37 +0000 (00:09 +0000)]
swscale: simplify unscaled rgb48<->bgr48

Using av_bswap16 should be enough.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 18 Jul 2012 20:27:46 +0000 (22:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: fix build with altivec disabled
  vp3: move idct and loop filter pointers to new vp3dsp context
  build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
  tscc2: do not add/subtract 128 bias during DCT
  tscc2: fix typo in DCT
  configure: clarify external library section of help output
  configure: mark libfdk-aac as nonfree
  configure: cosmetics: drop some unnecessary backslashes
  os_support: K&R formatting cosmetics

Conflicts:
configure
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws: more complete doxy for sws_setColorspaceDetails()
Michael Niedermayer [Wed, 18 Jul 2012 19:22:05 +0000 (21:22 +0200)]
sws: more complete doxy for sws_setColorspaceDetails()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavf/utils: show the number of stream in case of missing parameter
Stefano Sabatini [Wed, 18 Jul 2012 15:05:07 +0000 (17:05 +0200)]
lavf/utils: show the number of stream in case of missing parameter

Increase feedback provided in avformat_find_stream_info().

12 years agolavf/utils: suggest what to do in case of missing codec information
Stefano Sabatini [Sun, 15 Jul 2012 22:29:23 +0000 (00:29 +0200)]
lavf/utils: suggest what to do in case of missing codec information

In particular, fix trac issue #218.

12 years agolavf/utils: extend has_codec_parameters() to make it show what info is missing
Stefano Sabatini [Sun, 15 Jul 2012 22:27:09 +0000 (00:27 +0200)]
lavf/utils: extend has_codec_parameters() to make it show what info is missing

Improve feedback.

12 years agoimgconvert: favor pixel formats without resolution loss
Michael Niedermayer [Wed, 18 Jul 2012 15:17:46 +0000 (17:17 +0200)]
imgconvert: favor pixel formats without resolution loss

Fixes Ticket1517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavfiltergraph: add some debug info about selected pixel formats
Michael Niedermayer [Wed, 18 Jul 2012 15:17:23 +0000 (17:17 +0200)]
avfiltergraph: add some debug info about selected pixel formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoconfigure: simplify dependencies for x11_grab_device
Stefano Sabatini [Sun, 15 Jul 2012 16:01:23 +0000 (18:01 +0200)]
configure: simplify dependencies for x11_grab_device

XShmCreateImage dependency is implied by x11grab.

12 years agoconfigure: fix help message for --disable-avfilter
Stefano Sabatini [Sun, 15 Jul 2012 15:03:06 +0000 (17:03 +0200)]
configure: fix help message for --disable-avfilter

Increase consistency with the other similar messages.

12 years agolavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return...
Stefano Sabatini [Wed, 18 Jul 2012 13:41:20 +0000 (15:41 +0200)]
lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy

12 years agoffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines)
Michael Niedermayer [Wed, 18 Jul 2012 14:35:01 +0000 (16:35 +0200)]
ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines)

This commit caused Ticket1490 (Infinity loop / lock in export image)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomlpdec: switch to av_assert
Michael Niedermayer [Wed, 18 Jul 2012 14:19:51 +0000 (16:19 +0200)]
mlpdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws/input: switch to av_assert
Michael Niedermayer [Wed, 18 Jul 2012 14:18:32 +0000 (16:18 +0200)]
sws/input: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoppc: fix build with altivec disabled
Mans Rullgard [Wed, 18 Jul 2012 12:22:46 +0000 (13:22 +0100)]
ppc: fix build with altivec disabled

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agovp3: move idct and loop filter pointers to new vp3dsp context
Mans Rullgard [Tue, 17 Jul 2012 15:47:43 +0000 (16:47 +0100)]
vp3: move idct and loop filter pointers to new vp3dsp context

This moves all VP3-specific function pointers from dsputil to a
new vp3dsp context.  There is no reason to ever use the VP3 IDCT
where an MPEG2 IDCT is expected or vice versa.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agobuild: add CONFIG_VP3DSP, reduce repetition in OBJS lists
Mans Rullgard [Mon, 16 Jul 2012 11:50:14 +0000 (12:50 +0100)]
build: add CONFIG_VP3DSP, reduce repetition in OBJS lists

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agotscc2: do not add/subtract 128 bias during DCT
Kostya Shishkov [Tue, 17 Jul 2012 16:12:41 +0000 (18:12 +0200)]
tscc2: do not add/subtract 128 bias during DCT

It turns out that the reference decoder subtracts 128 from DC during block
decode but adds it back during reordering block with zigzag pattern.
Transforming block with incorrect DC caused heavy visual artifacts for
many quantisers.

12 years agotscc2: fix typo in DCT
Kostya Shishkov [Tue, 17 Jul 2012 15:34:58 +0000 (17:34 +0200)]
tscc2: fix typo in DCT

12 years agoconfigure: clarify external library section of help output
Diego Biurrun [Mon, 16 Jul 2012 16:19:13 +0000 (18:19 +0200)]
configure: clarify external library section of help output

12 years agoconfigure: mark libfdk-aac as nonfree
Diego Biurrun [Mon, 16 Jul 2012 23:32:01 +0000 (01:32 +0200)]
configure: mark libfdk-aac as nonfree

12 years agoconfigure: cosmetics: drop some unnecessary backslashes
Diego Biurrun [Mon, 16 Jul 2012 14:51:33 +0000 (16:51 +0200)]
configure: cosmetics: drop some unnecessary backslashes

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Jul 2012 23:27:19 +0000 (01:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavfiltergraph: document a catch in request_oldest().
Nicolas George [Tue, 17 Jul 2012 15:53:50 +0000 (17:53 +0200)]
avfiltergraph: document a catch in request_oldest().

This one is tricky. Consider a graph with two sink links, A and B.
request_oldest() requests on A, and A returns EOF. This EOF causes
a filter to flush pending frames to B; they are unrequested.
Then request_oldest() moves on to B, and B returns EOF.

12 years agoavfiltergraph: add a debug message on EOF.
Nicolas George [Tue, 17 Jul 2012 15:47:50 +0000 (17:47 +0200)]
avfiltergraph: add a debug message on EOF.

12 years agolavfi: rescale link->current_pts.
Nicolas George [Tue, 17 Jul 2012 15:43:39 +0000 (17:43 +0200)]
lavfi: rescale link->current_pts.

The doxy says, and the heap implementations assumes,
it is in AV_TIME_BASE units.

12 years agoos_support: K&R formatting cosmetics
Diego Biurrun [Sun, 15 Jul 2012 20:12:30 +0000 (22:12 +0200)]
os_support: K&R formatting cosmetics

12 years agoptx: correct decoding
Paul B Mahol [Mon, 16 Jul 2012 21:53:44 +0000 (21:53 +0000)]
ptx: correct decoding

The image data is in BGR and not in RGB.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agomov/aac: skip initial aac padding
Michael Niedermayer [Sun, 15 Jul 2012 13:29:01 +0000 (15:29 +0200)]
mov/aac: skip initial aac padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoriff: add "SM4V" FourCC
Piotr Bandurski [Tue, 17 Jul 2012 13:34:26 +0000 (15:34 +0200)]
riff: add "SM4V" FourCC

Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavf:rmdec.c fill duration to AVFormatContext
William Yu [Fri, 13 Jul 2012 09:16:01 +0000 (17:16 +0800)]
avf:rmdec.c fill duration to AVFormatContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibopenjpeg: introduce encoding support
Michael Bradshaw [Thu, 17 Nov 2011 23:57:09 +0000 (16:57 -0700)]
libopenjpeg: introduce encoding support

Based on FFmpeg version from
commit 713a7854e06964abc8f7d015b94acbed27769d24

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agolibopenjpeg: rename decoder source file.
Michael Bradshaw [Thu, 17 Nov 2011 14:39:16 +0000 (15:39 +0100)]
libopenjpeg: rename decoder source file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agosws: handle non native rgb<->rgb convertions
Michael Niedermayer [Tue, 17 Jul 2012 02:24:24 +0000 (04:24 +0200)]
sws: handle non native rgb<->rgb convertions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoyuv2rgb: implement 15/16bit ordered dither
Michael Niedermayer [Tue, 17 Jul 2012 02:47:23 +0000 (04:47 +0200)]
yuv2rgb: implement 15/16bit ordered dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoRTMPTS protocol support
Samuel Pitoiset [Tue, 17 Jul 2012 10:02:43 +0000 (12:02 +0200)]
RTMPTS protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoRTMPS protocol support
Samuel Pitoiset [Tue, 17 Jul 2012 10:02:42 +0000 (12:02 +0200)]
RTMPS protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>