xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,793 Commits 31 Branches 338 Tags 298 MiB
79450adfc8
Commit Graph

2340 Commits

Author SHA1 Message Date
Michael Niedermayer
4d02dfbde4 ffmpeg: Fix extradata allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-04 00:02:14 +02:00
Michael Niedermayer
6eb6956d06 ffmpeg: Fix indentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:39:06 +02:00
Michael Niedermayer
98c7729c13 ffmpeg: last frame duplication heuristic 
This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:09:31 +02:00
Himangi Saraogi
d768f8f5cf ffmpeg: Avoid null pointer dereferences 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 13:06:00 +02:00
Michael Niedermayer
215c2fe0ae Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995' 
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
  avconv: Print the avfilter errors

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 20:33:27 +01:00
Michael Niedermayer
f063a0b33d Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56' 
* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
  avconv: do not abort immediately if initializing hwaccel fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-10 10:49:48 +01:00
Clément Bœsch
c285937ccc ffmpeg: comment mpeg4 hack 
See 3734c3ea51
 2015-03-03 20:25:28 +01:00
Michael Niedermayer
5ee3a40f1c ffmpeg: Fix -vstats when coded_frame is not set 
There are several encoders which do not set coded_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-28 12:33:44 +01:00
Nicolas George
d92c6d82c0 ffmpeg: notify when the thread message queue blocks. 
This can help finding the source of A-V desync with live input.
 2015-02-26 19:19:56 +01:00
Nicolas George
508d6a23b4 ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
Michael Niedermayer
2384933985 ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-11 11:22:27 +01:00
Michael Niedermayer
77f326dc36 ffmpeg: Make CFR frame drop threshold user adjustable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 02:40:41 +01:00
Paul B Mahol
5274860fe2 ffmpeg: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:11 +00:00
Christophe Gisquet
1fa637d2ef ffmpeg: free_input_threads requires HAVE_PTHREADS 
Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 14:47:08 +01:00
Michael Niedermayer
85d7e02e4a ffmpeg: allow overriding and amending AVStream->disposition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 01:27:21 +01:00
Michael Niedermayer
90c98994f6 ffmpeg: Reduce noisiness of frame clipping in rate convertion 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-19 03:51:43 +01:00
Michael Niedermayer
a582705d15 ffmpeg: Favor filter graph based duration over ost->frame_rate in fps code 
The fate change adds a last frame with a subtitle not displayed in the previous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-19 03:13:16 +01:00
Michael Niedermayer
f96148913b Fix precission typos 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 22:42:42 +01:00
Michael Niedermayer
d3d9a00bcd ffmpeg: Use filter graph output frame rate also for frame duration estimation 
Previously the duration was sometimes wrong, this addition
limits the value and improves which frames are choosen when
reducing the frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 20:33:08 +01:00
Michael Niedermayer
7b32856011 ffmpeg: Maintain higher precision pts between video filter and fps code 
This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms

Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 19:53:17 +01:00
Michael Niedermayer
261e8ccbd1 ffmpeg: drop redundant frame_pts value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 16:42:20 +01:00
Anshul Maheshwari
bb0344dc55 ffmpeg: improve data stream support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:52:04 +01:00
raxon1s
4184d344af ffmpeg: Add bitrate value under -progress action 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 00:31:08 +01:00
Michael Niedermayer
0409155261 ffmpeg: remove unneeded NULL pointer check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 15:55:07 +01:00
Michael Niedermayer
6d1a2efb8a ffmpeg: Clear error message array at init. 
This avoids printing uninitialized bytes if no error message is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 23:02:30 +01:00
Michael Niedermayer
78cb3c069d ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:10:58 +01:00
Michael Niedermayer
627f5658b6 ffmpeg: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 02:56:02 +01:00
Simon Thelen
cc63da1223 ffmpeg: add sdp_file option 
Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 02:05:34 +01:00
Michael Niedermayer
d2f9aefbde ffmpeg: Check for subtitle_out malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 23:26:54 +01:00
Michael Niedermayer
28a6f970f6 ffmpeg: forward r_frame_rate to the muxer in case of stream copy 
Fixes Ticket3629 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 02:12:49 +01:00
Michael Niedermayer
242f1152bf ffmpeg: drop usage of coded_frame 
It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 03:06:43 +01:00
Christophe Gisquet
4c592c3908 ffmpeg: take bsf arguments from the command line 
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 13:11:34 +01:00
Michael Niedermayer
98e8a9e2f2 ffmpeg: Print a debug message if the frame parameters mismatch the context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-27 15:47:49 +01:00
Michael Niedermayer
33bc81e437 ffmpeg: skip duration cliping for passthrough & drop modes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 20:18:03 +01:00
Michael Niedermayer
4e20e94921 ffmpeg: Check duration for overlap and clip in fps cfr/vfr code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 18:36:36 +01:00
Michael Niedermayer
c509202590 ffmpeg: Use input packet duration in vfr/cfr code if available and valid 
Fixes Ticket3052
 2014-11-19 18:35:40 +01:00
Michael Niedermayer
61fc1cbfbd ffmpeg: fix printed timestamp for droped frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 13:26:59 +01:00
Michael Niedermayer
9f6d48d696 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>
 2014-11-19 05:14:32 +01:00
Michael Niedermayer
8b43b0e8b6 ffmpeg: fix variable type for end char 
fixes warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 03:05:09 +01:00
Michael Niedermayer
9421d974bc ffmpeg: Fix last newline at log level less than "info" 
Fixes Ticket3058

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 04:25:01 +01:00
Michael Niedermayer
6ef5e29220 Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2' 
* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 13:14:33 +02:00
Michael Niedermayer
2896b98183 Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f' 
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

See: 76191c08f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:30:55 +02:00
Michael Niedermayer
9bdb7a6c1a ffmpeg: avoid endlessly reading from one input while another is unavailable 
Testcase in Ticket 4051

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 22:26:32 +02:00
Michael Niedermayer
c48e8d9dca Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283' 
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 15:04:42 +02:00
Michael Niedermayer
61c6e69709 Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a' 
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
	ffmpeg.c

See: 4930cd13d6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-17 14:09:15 +02:00
Michael Niedermayer
137f7a630b Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a' 
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-15 18:56:44 +02:00
Michael Niedermayer
83f84e4c53 ffmpeg: Fix stream copy with initial_padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-14 03:30:03 +02:00
Michael Niedermayer
ac6b5bb834 Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8' 
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 02:06:39 +02:00
Michael Niedermayer
2284413206 ffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of hard failing 
Fixes stream copy from tserror270.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 01:38:12 +02:00
Michael Niedermayer
16de4d927e ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters 
Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-11 04:55:58 +02:00
Michael Niedermayer
ab84effded ffmpeg: Copy extradata if it has been initialized later from the encoder 
Fixes Ticket3909

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-07 03:13:44 +02:00
Michael Niedermayer
b01d2a5533 ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter 
Fixes/works around Ticket3768

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 19:51:58 +02:00
Michael Niedermayer
a2dbf379f0 avcodec/dvbsubdec: make compute_edt user settable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 19:51:58 +02:00
Michael Niedermayer
31f9c228c0 ffmpeg: Fix missing {} in Stream to Packet side data code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 23:34:20 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Michael Niedermayer
d3a22491c7 ffmpeg: remove 32 channel limit from audio_channels_map 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 05:38:47 +02:00
Christophe Gisquet
33fefdb449 ffmpeg: fix streamcopy with side data 
The issue is that, when the main packet data buffer is changed, streamcopy
uses a temporary new packet to store that buffer, frees the old packet, and
replace it with the new packet.

However, in doing so, it forgets about the side data, which gets freed, but
is still needed and referenced. Then, when the packet gets freed again in
the normal code path, it attempts to free its side data which has already
been freed.

Therefore, simply avoid the first free on side data by removing that side
data from the packet.

Fixes ticket #3773.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 03:43:17 +02:00
Michael Niedermayer
097bf149c9 Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d' 
* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d':
  avconv: rename output_packet() to process_input_packet()

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-14 00:23:30 +02:00
Michael Niedermayer
7d03732f7e ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 13:33:44 +02:00
Michael Niedermayer
01c17b5224 ffmpeg: Fix copying timebase to muxer context 
Fixes Ticket3741

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 15:51:31 +02:00
Michael Niedermayer
8bbadc9b6e ffmpeg: Use av_stream_get_parser() to avoid ABI issues 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 21:17:20 +02:00
Michael Niedermayer
59975de777 ffmpeg: fix integer overflows with sub->*display_time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 02:23:48 +02:00
Michael Niedermayer
9098f0ecd7 ffmpeg: remove common factors from copied timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:51:31 +02:00
Michael Niedermayer
8e7c8325d2 Merge commit '3f3232a371cc88696184d9aef1f812656264e56c' 
* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:44:25 +02:00
Michael Niedermayer
4930cd13d6 ffmpeg: check av_opt_set_dict() return 
Fixes CID1224275

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 05:53:13 +02:00
Sergey
6d2df3c00a ffmpeg: fix deadlock regression in threading error handing 
Commit fc9c857c introduced deadlock regression when processing too many inputs:
  ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null -
Happens for different number of inputs, depending on available memory size,
overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds,
that exhaust address space allocating 8-10 MB stack for each thread.
Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message.

This patch fixes both problems: it frees the queue to prevent deadlock
and adds a meaningful error message if pthread_create() fails.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 17:45:38 +02:00
Michael Niedermayer
c69f729947 ffmpeg: fix reinitializing with threads while flushing 
With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost

This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time

Fixes hqx fate with threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 00:09:09 +02:00
Anshul Maheshwari
7e6cf36453 ffmpeg: fix transcoding dvbsub to dvbsub 
fix ticket #2024

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 21:07:40 +02:00
Anshul Maheshwari
3639343478 ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 13:21:08 +02:00
Michael Niedermayer
afa7ab557a Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251' 
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 17:03:58 +02:00
Michael Niedermayer
fa0d0fb42e Merge commit '71d6551e674c86d07c165439c2bf6613b3892307' 
* commit '71d6551e674c86d07c165439c2bf6613b3892307':
  avconv: use the correct variable in comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-17 12:58:16 +02:00
Michael Niedermayer
5ded0b390b ffmpeg: for h264 we need has_b_frames from the decoder 
Other solutions welcome

Fixes Ticket3711

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 23:32:08 +02:00
Michael Niedermayer
378ad22492 ffmpeg: print values of mismatching has_b_frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 23:09:21 +02:00
Michael Niedermayer
10012fa961 ffmpeg: Fix bitstream filters manipulating AVCodecContext 
Fixes Ticket3715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 00:50:50 +02:00
Michael Niedermayer
52ce6be86b Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498' 
* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
  avconv: make -shortest work with streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-12 13:13:12 +02:00
Michael Niedermayer
27856b2fe9 ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy 
Fixes Ticket3658

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-05 18:37:32 +02:00
Michael Niedermayer
0efe3be71d Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3' 
* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3':
  avconv: Report the codec and the encoder separately

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-04 20:08:22 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Michael Niedermayer
137c5e115b ffmpeg: try to use the more fitting of the 2 encoder contexts 
This fixes the interactively enabled encoder debug by pressing 'D'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 19:48:25 +02:00
Michael Niedermayer
576654302b ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample() 2014-06-03 16:05:37 +02:00
Michael Niedermayer
2422a7ffe4 Loose mplayer in MPlayer/incoming/ 
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 16:03:44 +02:00
Michael Niedermayer
3e7b4b9fbd Add direct link to ML in missing_feature_sample() 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 15:58:27 +02:00
Michael Niedermayer
768ef0f19e ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch 
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 15:24:00 +02:00
Michael Niedermayer
a0b2de77ed ffmpeg: remove "has_b_frames" backpassing 
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 15:23:43 +02:00
Michael Niedermayer
00dcb10631 ffmpeg: Fix encoder names in printout 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 17:15:56 +02:00
Michael Niedermayer
0949bbc431 ffmpeg: fix for-muxer AVCodecContext stuff 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 17:15:55 +02:00
Michael Niedermayer
862120f980 Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 15:53:23 +02:00
Michael Niedermayer
a87685d8e8 ffmpeg: add note about why has_b_frame is copied and when it can be removed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 15:32:50 +02:00
Michael Niedermayer
921d5ae3bc ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 15:30:51 +02:00
Michael Niedermayer
9fb45334fc ffmpeg: copy b frame codec delay back from decoder to demuxer 
The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 15:30:15 +02:00
Michael Niedermayer
d097935767 Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5' 
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
  avconv: do not use the stream codec context for decoding

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-01 14:35:53 +02:00
Michael Niedermayer
b3f4615081 ffmpeg: fix check for muxing overhead being unknown 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 23:39:54 +02:00
Nicolas George
fc9c857c2d ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
Michael Niedermayer
1f359c8559 ffmpeg: use av_stream_get_end_pts() 
Simplifies code and should correct timing values when -*sync drop is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-21 18:53:42 +02:00
Michael Niedermayer
b2a8bc3d04 ffmpeg/set_encoder_id: dont allocate encoder string if one is already set 
Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-20 00:51:47 +02:00
Lukasz Marek
4d686674b2 ffmpeg: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:44 +02:00
Michael Niedermayer
833ec9177d ffmpeg/do_video_stats: fix used timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-19 20:54:27 +02:00
Michael Niedermayer
dad54e4a62 ffmpeg: set dts for subtitles 
dts is not optional, its required for muxing,
previously it was set from AVStream.pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-19 16:07:50 +02:00
Michael Niedermayer
87f5ede6b5 ffmpeg: add last_mux_dts_plus_duration 
Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-19 15:35:20 +02:00
Michael Niedermayer
2de2b991ca Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0' 
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
  avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-19 15:13:16 +02:00
Olivier Langlois
76191c08f8 ffmpeg: Use av_gettime_relative() 
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-19 02:35:07 +02:00
Michael Niedermayer
0c152fe916 ffmpeg: prefix encoder with "Lavc " in bitexact mode 
This avoids misleading encoder names like "encoder = prores"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 22:57:20 +02:00
Michael Niedermayer
bbee02ed9c ffmpeg: Skip writing the version when -flags bitexact is used 
Alternatively every fate test could be changed to pass both fflags and flags +bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 22:00:00 +02:00
Michael Niedermayer
1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 21:31:51 +02:00
Michael Niedermayer
8334850a99 Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce' 
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 14:38:36 +02:00
Michael Niedermayer
e9602dcb4d ffmpeg: bitstream filters require split out side data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-15 22:41:12 +02:00
Lukasz Marek
a5f2f33a67 ffmpeg: use av_fifo_freep 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-07 23:39:47 +02:00
Michael Niedermayer
d5ec1ddf7b Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 
* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 15:51:55 +02:00
Michael Niedermayer
22ffa5390f Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11' 
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 15:09:55 +02:00
Michael Niedermayer
1efc089218 Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d' 
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 15:03:52 +02:00
Michael Niedermayer
1f40536cca Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c' 
* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 14:55:26 +02:00
Michael Niedermayer
42b7bda41a Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66' 
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 14:44:33 +02:00
Michael Niedermayer
6e39707438 Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3' 
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 14:39:13 +02:00
Michael Niedermayer
a3477fef2b ffmpeg: put the sizeof() second in av_malloc_array() 
This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 22:01:38 +02:00
Michael Niedermayer
feaa31d354 ffmpeg: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 02:23:08 +02:00
Michael Niedermayer
ed72dae4cf ffmpeg: dont print "Conversion failed" if conversion has never started 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 23:45:22 +02:00
Michael Niedermayer
fed0acebad ffmpeg: print an error at the end if conversion failed 
Fixes Ticket3477

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 00:09:08 +02:00
Michael Niedermayer
3bf189bb00 Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b' 
* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:45:34 +02:00
Michael Niedermayer
e48fb4e1a5 ffmpeg: fix mixed merged & split side data with the stream->packet hack 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 01:01:38 +02:00
Michael Niedermayer
517cc81e93 ffmpeg: stop protocols on interrupt when no transcoding has happened yet 
Fixes Ticket3344

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 22:29:23 +02:00
Michael Niedermayer
506064ed10 ffmpeg: frame droping due to fps should not be a warning 
This reverts part of 41e7e46cac

See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 21:15:31 +02:00
Michael Niedermayer
41e7e46cac Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc' 
* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 19:25:10 +01:00
Michael Niedermayer
cb640eb335 ffmpeg: move packet deallocation into write_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 19:50:39 +01:00
Michael Niedermayer
33a7e288ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:46:06 +01:00
Michael Niedermayer
1046cd60d4 Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:40:35 +01:00
Michael Niedermayer
afa442c198 Merge commit 'a220b07b0f971f88213aef012aea51af2800be62' 
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:30:29 +01:00
Michael Niedermayer
13278b97ae Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2' 
* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:11:13 +01:00
Michael Niedermayer
8a9878b4ff Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8' 
* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
  avconv: explicitly report when the muxing overhead is unknown

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 15:52:50 +01:00
Michael Niedermayer
82e6660ae2 Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9' 
* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 14:44:22 +01:00
Nicolas George
521707d42e ffmpeg: sub2video: send a last blank frame before closing. 
Fix trac ticket #3420.
 2014-03-23 19:16:35 +01:00
Michael Niedermayer
9dca02ee54 ffmpeg: dont call exit_program() from a signal hander 
This is unsafe and can deadlock amongth other things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 17:09:56 +01:00
Michael Niedermayer
d3ed8a4d2b ffmpeg: try to avoid calling av_log() from sigterm_handler() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 16:24:17 +01:00
Michael Niedermayer
4d17179b37 ffmpeg: fix printing INT64_MIN pts at the end 
Fixes Ticket3427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-16 06:26:40 +01:00
Michael Niedermayer
b79dfd16cb ffmpeg: dont try to run the subtitle encoder on non subtitle streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-03 21:06:24 +01:00
Michael Niedermayer
70a25587d2 Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:08:19 +01:00
Michael Niedermayer
f2387152bc Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05' 
* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
  avconv: Do not divide by zero

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-20 23:59:09 +01:00
Nicolas George
299a56879d ffmpeg: make reading packets from thread blocking. 
If a packet is not ready on the input selected by ffmpeg,
it will read from another input instead. If that happens
repeatedly, frames will accumulate somewhere later in the
processing to ensure streams synchronization. It can happen
in particular when reading from a slow medium or an
expensive lavfi filter graph.

Make reading from normal demuxers on non-streamed data and
from the lavfi pseudo-device blocking to avoid that.

Should fix trac ticket #3079.
 2014-02-20 11:22:55 +01:00
Michael Niedermayer
3734c3ea51 ffmpeg: reduce frame rate for mpeg4 to be within the spec limits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 18:40:27 +01:00
Michael Niedermayer
3868e97c6b ffmpeg: fix vstats 
Broken by: 394fb56c29
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:31:06 +01:00
Stefano Sabatini
290da7e754 ffmpeg: tweak debug_ts logging and add more of it 
Help with debugging timestamp issues.
 2014-02-02 13:11:52 +01:00
Michael Niedermayer
2e02d71237 ffmpeg: print data size too in statistic 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-31 01:36:47 +01:00
Michael Niedermayer
be7b76230f ffmpeg: also count data streams bytes 
Fixes wrong error message about empty output file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 20:17:10 +01:00
Stefano Sabatini
9651239f67 ffmpeg: use intermediary variables in reap_filters, increase readability 2014-01-26 18:06:39 +01:00
Stefano Sabatini
094516a5d0 ffmpeg: use av_err2str() macro 
Simplify.
 2014-01-23 16:29:44 +01:00
Stefano Sabatini
9f956d9d8d ffmpeg: apply misc cosmetics to process_input() code 2014-01-23 16:29:39 +01:00
Michael Niedermayer
740e6042a0 ffmpeg: change ost->finished to an enum 
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:57:02 +01:00
Michael Niedermayer
d73f897669 ffmpeg: update statistics only when a packet is actually muxed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:39 +01:00
Michael Niedermayer
5c459504f6 ffmpeg/flush_encoders: dont mux packets once ost->finished has been set 
Fixes muxing frames after av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:38 +01:00
Michael Niedermayer
706741e8d7 ffmpeg: properly close down muxers on av_interleaved_write_frame() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:38 +01:00
Michael Niedermayer
4ff77d4451 ffmpeg: check ost->finished in check_output_constraints() 
No testcase but it seems logic to stop when finished is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:37 +01:00
Michael Niedermayer
7d91fb305e ffmpeg: check ost->finished in reap_filters() 
This avoids finished output streams continuing to receive frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 23:47:36 +01:00
Michael Niedermayer
206c06d96f Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683' 
* commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683':
  avconv: print a warning when falling back to default 25fps

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:11:53 +01:00
Michael Niedermayer
88956f73f2 ffmpeg: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection 
This should make discontinuity detection more robust and detect
more cases. Timestamps after the decoder can be delayed due to threads,
timestamps before can be missing

no testcase available/known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-22 19:48:00 +01:00
Jan Gerber
200cfab8c4 remuxing .opus files to .webm codec->delay must be copied too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-19 23:43:14 +01:00
Michael Niedermayer
e22e943ef9 Merge commit '674fa49110a661694188a958be13d529b7c8c5dd' 
* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:36:10 +01:00
Michael Niedermayer
4cbf3eb9e6 Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9' 
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:18:51 +01:00
Marton Balint
31bb172be2 ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration 
When fix_sub_duration is used, and the duration fixing code is generating 0
duration, that is definitely zero, and not undefined or infinite (which may be
the case for decoded AVSubtitles depending on the codec), so it is safe to drop
it.

It fixes teletext subtitle sources, when the subtitles are transmitted twice
after each other for some reason.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
 2013-11-28 21:30:03 +01:00
Marton Balint
4d6f2ff524 ffmpeg: free empty subtitles as well in transcode_subtitles 
Even if it does not matter at the moment, because subtitles with num_rect == 0
have no memory allocated, this is how we expect the users to use the API, a
returned AVSubtitle should be freed with avsubtitle_free.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
 2013-11-28 21:30:03 +01:00
Marton Balint
3e396ca8ed ffmpeg: do not pass possibly undefined subtitles to sub2video_update 
It should not matter for real-life usage, it is just cleaner this way.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
 2013-11-28 21:29:54 +01:00
Michael Niedermayer
738ebb4a0e ffmpeg: set VCFR when copying timestamps 
This fixes unreasonable initial frame repeats
Fixes Ticket3176

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 02:28:50 +01:00
Michael Niedermayer
ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Michael Niedermayer
62e10c3759 Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325' 
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:31:15 +01:00
Michael Niedermayer
d7ac887cd6 cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile 
might fix Ticket3056

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 18:27:46 +01:00
Michael Niedermayer
df87cfd798 ffmpeg: fix do_streamcopy() so it copies side data too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 00:23:23 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Michael Niedermayer
d7ebeba80c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 
Fixes different behavior to JM and probably several if not all
reference decoders.

We cannot just do this unconditionally as it would ruin AV sync in
some use cases.

Bug-Found-by: BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 14:27:29 +01:00
Michael Niedermayer
8cdf4e0823 ffmpeg: remove unneeded include "libswscale/swscale.h" 
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 21:45:19 +01:00
Michael Niedermayer
9c52ab6f4f ffmpeg: treat avi as VFR in framerate conversion code 
It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 00:09:32 +01:00
Michael Niedermayer
c6c03dfdf1 Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53' 
* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
  lavc: deprecate FF_DEBUG_MV and remove all traces of its use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:22:42 +01:00
Michael Niedermayer
0460b9bb3e Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:38:53 +01:00
Michael Niedermayer
ed49e91fd7 Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46' 
* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
  avconv: drop a now useless variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:46:47 +01:00
Michael Niedermayer
a443b9732f ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it 
Fixes Ticket2969

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 02:08:35 +02:00
Michael Niedermayer
b36257921e ffmpeg: Dont crash on unconnected output pads before an error is printed 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 11:39:43 +02:00
Michael Niedermayer
a72bf5fd11 ffmpeg: set the source_index for trivial filter graphs 
Fixes one testcase in Ticket2969

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 00:51:09 +02:00
Michael Niedermayer
b6b9c150f0 ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding. 
Suggested-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 23:58:59 +02:00
Michael Niedermayer
38e13f55a5 ffmpeg: dont detect slight (0.1sec) backward moving dts as discontinuity 2013-10-07 01:36:05 +02:00
Michael Niedermayer
0425fd7eb2 ffmpeg: dont return reserved values 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 12:59:39 +02:00
Michael Niedermayer
7883827cb7 ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 14:13:44 +02:00
Michael Niedermayer
1525107313 ffmpeg: improve built in docs for passing commands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 14:13:18 +02:00
Michael Niedermayer
f8f4e48b6d ffmpeg: print command replies starting on column 0 
This fixes formating issues with multi-line replies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 13:57:29 +02:00
Carl Eugen Hoyos
47f9a5b737 Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding. 
Fixes ticket #2870.
 2013-08-18 22:00:35 +02:00
Michael Niedermayer
b7fc2693c7 Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:41:04 +02:00
Michael Niedermayer
3fa72de82f Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8' 
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 10:25:32 +02:00
Stefano Sabatini
f118b41759 ffmpeg: raise level for message printed in case of auto-select pixel format 
Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-08-01 21:14:48 +02:00
Michael Niedermayer
f982d006bb Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:34:11 +02:00
Derek Buitenhuis
58950ca0df ffmpeg: Don't include colorspace.h 
The header is private, and ffmpeg.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-29 16:44:12 -04:00
Michael Niedermayer
cc61ef0479 Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:55 +02:00
Michael Niedermayer
d894e64acc Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f' 
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:05 +02:00
Michael Niedermayer
4abd5a4318 Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c' 
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:20:26 +02:00
Nicolas George
fc82f4a1f8 ffmpeg: ignore EOF when pushing frames to filters. 
EOF is not a fatal condition, it is normally produced
by a few filters.

TODO: take it into account to avoid useless decoding.
 2013-06-02 23:19:42 +02:00
Justin Ruggles
e816a8bc26 ffmpeg: use actual packet pts when discarding for the copypriorss option 
The ist->pts value at this point does not necessarily match the actual packet
pts, which is what should be used to decide whether to discard the packet.
Without this change, some video packets that have pts on or after the start
time are getting discarded when they should not be.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-05-28 17:03:23 -04:00
Michael Niedermayer
2ad28840b3 Merge commit '538bf767373f176b6487e30181155e74b37cced6' 
* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:52:03 +02:00
Michael Niedermayer
1a36c756d8 ffmpeg: free threads on error conditions. 
Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 01:28:59 +02:00
Michael Niedermayer
33ff943f70 ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
410905f7fd ffmpeg: use av_freep() for forced_kf_pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
0966623604 ffmpeg: drop old non monotone dts workaround. 
All bugs should now be fixed in the new so the old can be droped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:04:47 +02:00
Michael Niedermayer
af2d964336 ffmpeg: set correct log context for non monotone dts workaround warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:03:35 +02:00
Michael Niedermayer
b2a1d92b7b ffmpeg: port loglevel selection code to new dts workaround code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:02:43 +02:00
Michael Niedermayer
30c05f6b02 ffmpeg: fix pts handling in the non monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:00:21 +02:00
Michael Niedermayer
007ee09d7c ffmpeg: fix the used maximum dts in the monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:58:28 +02:00
Michael Niedermayer
26b89f6274 ffmpeg: use a max variable to hold the maximum dts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:57:05 +02:00
Michael Niedermayer
6b2fbdb047 ffmpeg: Check dts before use in non monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:55:20 +02:00
Michael Niedermayer
ee3824f6f6 ffmpeg: limit non monotone workaround to audio & video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:55:12 +02:00
Michael Niedermayer
9fe2a62cc4 ffmpeg: move non monotone prevention code down 
This moves the code to after the bitstream filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:52:37 +02:00
Michael Niedermayer
2b7f595aca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:52:03 +02:00
Michael Niedermayer
22dc25cb29 Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe' 
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 13:53:08 +02:00
Michael Niedermayer
49ec4c7e49 ffmpeg: fix segfault with random output 
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-02 16:01:28 +02:00
Michael Niedermayer
4818388e6c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
	Changelog
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 17:24:43 +02:00
Michael Niedermayer
76c1f9200f Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2' 
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2':
  avconv: make -t insert trim/atrim filters.

The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.

Conflicts:
	Changelog
	ffmpeg.c
	ffmpeg_filter.c
	tests/ref/fate/bethsoft-vid
	tests/ref/lavf/aiff
	tests/ref/lavf/asf
	tests/ref/lavf/au
	tests/ref/lavf/avi
	tests/ref/lavf/dpx
	tests/ref/lavf/ffm
	tests/ref/lavf/gxf
	tests/ref/lavf/jpg
	tests/ref/lavf/mkv
	tests/ref/lavf/mmf
	tests/ref/lavf/mov
	tests/ref/lavf/mpg
	tests/ref/lavf/nut
	tests/ref/lavf/ogg
	tests/ref/lavf/pcx
	tests/ref/lavf/png
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/lavf/voc
	tests/ref/lavf/voc_s16
	tests/ref/lavf/wav

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 14:23:52 +02:00
Nicolas George
b1cc12d0e3 ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
Stefano Sabatini
f6c9a325b7 ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure 2013-04-14 20:30:37 +02:00
Michael Niedermayer
835cc0f2e7 Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
  lavfi: change the filter registering system to match the other libraries

Conflicts:
	cmdutils.c
	ffplay.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h

This removes the ability to put AVFilters in read only memory and having
them shareable.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:08:40 +02:00
Michael Niedermayer
231fd4411f Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 23:50:39 +02:00
Stefano Sabatini
270217908b ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
Michael Niedermayer
f1c0c6b7de Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:49:39 +02:00
Michael Niedermayer
6a78ec180e ffmpeg: print frame decoding error statistic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:47:03 +02:00
Michael Niedermayer
eedcac68f3 ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded. 
Fixes Ticket2405

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:40:06 +02:00
Nicolas George
de38e7c8c3 ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
Carl Eugen Hoyos
1c0d8f2563 Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed. 
Tested-by: Nevcairiel
 2013-04-04 00:01:34 +02:00
Michael Niedermayer
356363c898 ffmpeg: Fix forcing of the framerate for stream copy on input 
Fixes Ticket2211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 18:19:23 +02:00
Michael Niedermayer
f7a02d5d69 ffmpeg: initialize got_output, this silences a compiler warning from icc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 20:47:48 +02:00
Michael Niedermayer
ac1a1fd708 Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
	Changelog
	doc/ffmpeg.texi
	doc/filters.texi
	ffmpeg.h
	ffmpeg_opt.c
	libavfilter/vf_gradfun.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 13:00:39 +01:00
Thierry Foucu
fcf73f9c01 Call do_video_stats when duplicating frame 
When multiple frame are encoded during vsync, current code only
do_video_stats once. This need to do it every frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 12:29:12 +01:00
Michael Niedermayer
4c1f61b1e8 ffmpeg: Correct inter stream timestamp discontinuities 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 04:53:44 +01:00
Michael Niedermayer
4257b804e2 ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:54:04 +01:00
Nicolas George
6a90f6d789 ffmpeg: fix freeing of sub2video frame. 2013-03-20 21:13:55 +01:00
Carl Eugen Hoyos
e4f5aa5e8d Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding. 2013-03-19 01:16:37 +01:00
Michael Niedermayer
b1a9a2c4ff ffmpeg: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:58:10 +01:00
Michael Niedermayer
32fdfdfbda Merge commit '354468fc12dcf93e7fb4af552e18906771913273' 
* commit '354468fc12dcf93e7fb4af552e18906771913273':
  avplay: switch to new refcounted frames API
  avconv: convert to new refcounted AVFrame API

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffmpeg.h
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 14:16:02 +01:00
Nicolas George
fb14e37dd0 ffmpeg: re-enable use of buffersrc flags. 
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
 2013-03-10 14:07:29 +01:00
Nicolas George
f9b34b8bf9 ffmpeg: port sub2video to AVFrame. 
And re-enable the FATE test.
 2013-03-10 13:45:15 +01:00
Nicolas George
4e7c61b7a7 ffmpeg: do not give away our reference to the frame. 
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
 2013-03-10 01:41:50 +01:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:40:35 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Carl Eugen Hoyos
199db97fbd Close output codecs if input codec initialisation fails. 
Fixes ticket #1546 and the remaining part of ticket #1244.
 2013-03-08 02:46:46 +01:00
Michael Niedermayer
8cc5481d51 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: Deprecate the deinterlace functions in libavcodec
  h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

Conflicts:
	configure
	ffmpeg_opt.c
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/imgconvert.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 11:50:17 +01:00
Ronald S. Bultje
2cffe38df3 Deprecate deinterlaced in libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 21:11:48 +01:00
Michael Niedermayer
9af8179cdb ffmpeg: fix -stats -v 0 
Fixes Ticket1687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 19:38:13 +01:00
Michael Niedermayer
4ae74c6312 ffmpeg: print maxrss "-benchmark" data even on errors 
Fixes Ticket2297

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 16:04:49 +01:00
Michael Niedermayer
41401773d3 Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311' 
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 12:57:17 +01:00
Michael Niedermayer
e20f2dc048 ffmpeg: fix variable name in psnr printing code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 00:25:03 +01:00
Nicolas George
f102c24d90 ffmpeg: free last sub when using -fix_sub_duration. 
Fix trac ticket #2242.

Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.
 2013-02-27 18:57:33 +01:00
Michael Niedermayer
ad899522ff ffmpeg: use a AVDictionary instead of the context to move swr parameters around 
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00
Michael Niedermayer
6db37c9468 Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 17:41:31 +01:00
Michael Niedermayer
c3fb20bab4 ffmpeg: Check for parameter changes at the output of the audio filter graph 
It is currently possible that such changes leak through from the decoder as
well as a filter could generate such changes itself.
This commit blocks such changed packets unless the encoder declares support.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-14 23:56:51 +01:00
Michael Niedermayer
3b1f037df5 ffmpeg: fix streamcopy of lsf mp3. 
Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 00:38:22 +01:00
Michael Niedermayer
127ff88639 ffmpeg: do not call exit from exit_program() 
This should fix  Ticket2116

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 04:03:52 +01:00
Stefano Sabatini
43af18ef8b ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
Nicolas George
41f025dff0 ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00