generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,605 Commits 24 Branches 241 Tags
Commit Graph

42605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
739ec710c4 lavf/utils: suggest what to do in case of missing codec information 
In particular, fix trac issue #218.
 2012-07-18 18:08:57 +02:00
Stefano Sabatini
a293549b32 lavf/utils: extend has_codec_parameters() to make it show what info is missing 
Improve feedback.
 2012-07-18 18:08:56 +02:00
Michael Niedermayer
31a192f387 imgconvert: favor pixel formats without resolution loss 
Fixes Ticket1517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 17:22:17 +02:00
Michael Niedermayer
ef1c0b5295 avfiltergraph: add some debug info about selected pixel formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 17:22:17 +02:00
Stefano Sabatini
6a314d59d5 configure: simplify dependencies for x11_grab_device 
XShmCreateImage dependency is implied by x11grab.
 2012-07-18 17:13:34 +02:00
Stefano Sabatini
0cc9077a87 configure: fix help message for --disable-avfilter 
Increase consistency with the other similar messages.
 2012-07-18 17:13:29 +02:00
Stefano Sabatini
712d82130e lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy 2012-07-18 17:13:00 +02:00
Michael Niedermayer
dece4f4693 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>
 2012-07-18 16:35:38 +02:00
Michael Niedermayer
60f3291086 mlpdec: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 16:22:41 +02:00
Michael Niedermayer
ba0e69994d sws/input: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 16:22:41 +02:00
Michael Niedermayer
56ae5926f7 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>
 2012-07-18 01:27:19 +02:00
Nicolas George
d483867525 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.
 2012-07-17 23:47:33 +02:00
Nicolas George
f98d814bb6 avfiltergraph: add a debug message on EOF. 2012-07-17 23:46:26 +02:00
Nicolas George
d06bfda07e lavfi: rescale link->current_pts. 
The doxy says, and the heap implementations assumes,
it is in AV_TIME_BASE units.
 2012-07-17 23:46:26 +02:00
Paul B Mahol
0b74b8f649 ptx: correct decoding 
The image data is in BGR and not in RGB.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 17:06:24 +00:00
Michael Niedermayer
ad8dabfe9c mov/aac: skip initial aac padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 17:09:19 +02:00
Piotr Bandurski
b688c7b7f9 riff: add "SM4V" FourCC 
Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 16:56:51 +02:00
William Yu
6d4e0d1b7e avf:rmdec.c fill duration to AVFormatContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 16:47:20 +02:00
Michael Bradshaw
453c02f971 libopenjpeg: introduce encoding support 
Based on FFmpeg version from
commit 713a7854e06964abc8f7d015b94acbed27769d24

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-17 14:56:58 +02:00
Michael Bradshaw
b43a7bb4f9 libopenjpeg: rename decoder source file. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-17 14:56:22 +02:00
Michael Niedermayer
21d8255423 sws: handle non native rgb<->rgb convertions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 14:40:59 +02:00
Michael Niedermayer
22a279539e yuv2rgb: implement 15/16bit ordered dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 14:25:49 +02:00
Samuel Pitoiset
86991ce2dd RTMPTS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 14:02:55 +03:00
Samuel Pitoiset
6aedabc9b6 RTMPS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 13:53:33 +03:00
Nicolas George
1d903a5ee4 lswr: channel_map requires input conversion. 
channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
 2012-07-17 09:50:36 +02:00
Anton Khirnov
5417efbbf3 avconv: print an error message when demuxing fails. 
Also exit in such a case if -xerror is used.

Fixes bug 329.
 2012-07-17 09:50:26 +02:00
chinshou
81dd908c6e Fix libilbc compilation. 
Fixes ticket #1540
 2012-07-17 08:53:36 +02:00
Carl Eugen Hoyos
7f5fae1e48 mpeg4videodec: Add two missing format specifiers for debug output. 2012-07-17 08:12:49 +02:00
Carl Eugen Hoyos
34aa61a36d mpeg4videodec: Use format specifier PRId64 for int64_t. 2012-07-17 08:11:31 +02:00
Carl Eugen Hoyos
6dfea3a361 Remove internal MPlayer FourCC viv1. 
Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
 2012-07-17 08:09:32 +02:00
Kostya Shishkov
0b40153d20 tscc2: DCT output should not be clipped 
This fixes decoding some TSCC2 files with large quantisers.
 2012-07-17 07:21:24 +02:00
Michael Niedermayer
bdf28d14f2 sws: extend dither tables by 1 line so simpler arithmetic can be used to address the next line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-17 05:40:36 +02:00
Paul B Mahol
3071af6cf2 tiff: read more tags of type string 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:23:35 +00:00
Paul B Mahol
292850b634 tiff: add smarter checks if there is enough data left 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:23:34 +00:00
Paul B Mahol
1ec83d9a9e tiff: port to bytestream2 
Prevents out of array reads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-17 01:12:55 +00:00
Samuel Pitoiset
775c4d3625 rtmp: Rename rtmphttp to ffrtmphttp 
The prefix makes it easier to distinguish the proper end-user
protocols from the internal ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 01:19:01 +03:00
Paul B Mahol
6dac8c8327 lavu: disable av_uninit for clang 
This silence bunch of useless warnings like:

libavformat/mpeg.c:393:37: warning: variable 'dvdaudio_substream_type' is uninitialized when used within its own initialization [-Wuninitialized]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-16 19:30:13 +00:00
Michael Niedermayer
9db747b2a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
  configure: Move the getaddrinfo function check into the network block
  configure: Remove an unused 'have' item
  mpeg: remove disabled code
  libfdk-aac: Check if cutoff value is valid
  network: Always use our version of gai_strerror on windows
  network: Undefine existing gai_strerror definitions
  network: Extend the fallback gai_strerror implementation to handle more error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 20:45:41 +02:00
Michael Niedermayer
5dba4cbc2f ffmpeg: fix streamcopy of some mp3 in avi 
Fixes Ticket1432

Thanks-to: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com> for some of the bug analysis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 16:56:03 +02:00
Michael Niedermayer
b45a313e97 ffv1dec: fix error concealment for gop>1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 16:48:09 +02:00
Nick Brereton
e03077c432 Fix DCA-XXCH extension scaling for embedded downmixes. 
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 16:06:01 +02:00
Nick Brereton
73154feec1 Fix ordering of XXCH downmix coefficients. 
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 16:05:25 +02:00
Michael Niedermayer
ac9389a663 ffv1dec: detect errors in bytestream end mismatches for EC 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 15:48:04 +02:00
Michael Niedermayer
b0d674ec10 ffv1dec: set the first slices bytestream end correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 15:48:04 +02:00
Michael Niedermayer
f5af3568f6 ffv1dec: keep track of errors in slice headers for EC 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 15:48:04 +02:00
Michael Niedermayer
094845aad8 ffv1dec: add simple error concealment in case of CRC errors on slices. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 15:48:04 +02:00
Michael Niedermayer
371d37fcf5 ffv1: keep last_frame (to be used for error concealment) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 15:38:27 +02:00
Michael Niedermayer
8486c8cc9a configure: print if the docs building tools have been found 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 14:45:41 +02:00
Tim Nicholson
45641014d3 doc/filters: Fix two typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-16 14:01:01 +02:00
Jordi Ortiz
08e087ccf7 rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-07-16 13:45:15 +02:00