RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity
58,806 Commits 37 Branches 400 Tags 246 MiB
8f1edc73a8
Commit Graph

58806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
48e1394095 mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext. 2013-11-29 14:19:47 +01:00
Anton Khirnov
c2f7417eeb vc1: move MpegEncContext.resync_marker into VC1Context. 
The field still remains in MpegEncContext because it is used by the
mpeg4 decoder.
 2013-11-29 14:19:47 +01:00
Anton Khirnov
a5a71992ca mpeg4videoenc: don't set MpegEncContext.resync_marker 
It is only used in one place immediately after it is set.
 2013-11-29 14:19:47 +01:00
Anton Khirnov
ad09f52586 h263dec: remove commented out cruft 2013-11-29 14:19:47 +01:00
Anton Khirnov
bc5abfb19e mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext 2013-11-29 14:19:47 +01:00
Anton Khirnov
9f0617d213 mpeg4videodec: remove write-only sprite variables from MpegEncContext 2013-11-29 14:19:47 +01:00
Anton Khirnov
1a89025793 mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext 2013-11-29 14:19:47 +01:00
Anton Khirnov
75bd07f732 mpeg4videoenc: write 0 instead of vol_sprite_usage 
That field is never set for encoding.
 2013-11-29 14:19:47 +01:00
Anton Khirnov
e62a43f6b1 mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext 
The field remains in MpegEncContext for use in the encoder.
 2013-11-29 14:19:47 +01:00
Anton Khirnov
ee8af2dd99 mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext 2013-11-29 14:19:47 +01:00
Anton Khirnov
35e0833d41 mpeg4videodec: add a mpeg4-specific private context. 2013-11-29 14:19:47 +01:00
Anton Khirnov
95fd52c11b mxfdec: set extradata size 
The line setting it was mistakenly removed in
ecf442a58b
 2013-11-29 14:19:47 +01:00
Michael Niedermayer
6e7de11444 avcodec/dcadec: decode LFE so we dont just add random data when downmixing with LFE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 14:13:05 +01:00
Stefano Sabatini
73b8730475 ffserver: improve error feedback in case of write_header() failure 2013-11-29 12:11:39 +01:00
Stefano Sabatini
b133ec6244 ffserver: improve feedback in case no feed is defined for a stream 2013-11-29 12:11:34 +01:00
Stefano Sabatini
0083514727 ffserver: improve feedback in case of stream with unknown feed name 2013-11-29 12:11:28 +01:00
Stefano Sabatini
0d640c08eb doc/ffserver: specify missing argument for ACL feed option 2013-11-29 10:28:03 +01:00
Stefano Sabatini
6dac34b853 doc/ffserver: fix RTSPOtion tpo 
Spotted-by: ubitux
 2013-11-29 10:28:03 +01:00
Stefano Sabatini
98e47c1a7e doc/ffserver: extend documentation for Feed/File stream options 2013-11-29 10:28:03 +01:00
Stefano Sabatini
0e64edda18 doc/ffserver: uncomment line in stream section example 2013-11-29 10:28:03 +01:00
Stefano Sabatini
cdff4c5313 doc/ffserver: reorder encoding options, and mark them as such 
Also add notice about ffmpeg -override_ffserver option.
 2013-11-29 10:28:03 +01:00
Stefano Sabatini
f87e189ee0 doc/ffserver: extend documentation for various file-related options 2013-11-29 10:28:03 +01:00
Stefano Sabatini
b1049f89fa ffserver: deprecate inconsistent parsing behavior of Truncate option 
Also make it accept the more consistent behavior (boolean option set to
true when specified).
 2013-11-29 10:28:03 +01:00
Stefano Sabatini
0124fca03f ffserver: extend feedback in http_start_receive_data() 2013-11-29 10:28:03 +01:00
Michael Niedermayer
d2e46b11e4 avcodec/dcadec: set AV_CLASS_CATEGORY 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 04:56:37 +01:00
Michael Niedermayer
55bd20a841 avcodec/dcadec: AVClass is const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 04:56:18 +01:00
Michael Niedermayer
5b3c684147 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dcadec: add disable_xch private option.

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 04:39:52 +01:00
Michael Niedermayer
3f41e57fa8 Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5' 
* commit '220494ad0b2e9e980ef703b46b69308236f29be5':
  dcadec: treat all 2-channel modes as Stereo in dca_downmix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 04:21:34 +01:00
Michael Niedermayer
97468463a2 Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48' 
* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
  dca: support mixing LFE in dca_downmix.

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 04:00:59 +01:00
Michael Niedermayer
7ea9c4a94c Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2' 
* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
  dca: improve default stereo downmix coefficients.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 03:48:29 +01:00
Michael Niedermayer
12235a3ed2 avcodec/dcadec: print more details about errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 03:42:03 +01:00
Michael Niedermayer
43ec456320 Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1' 
* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
  dca: extract core substream's embedded downmix coeffcient codes, if present.

Conflicts:
	libavcodec/dcadata.h
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 03:28:15 +01:00
Michael Niedermayer
c122e697fa Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9' 
* commit '27245b4e1bbb7a863341db321b5bdc5792e427d9':
  dca: remove embedded downmix coefficient extraction.

Conflicts:
	libavcodec/dcadata.h
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 01:12:02 +01:00
Michael Niedermayer
a7f8817720 Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d' 
* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
  dca: convert dca_default_coeffs to float.

Conflicts:
	libavcodec/dcadata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 00:32:14 +01:00
Michael Niedermayer
e9a47896a0 Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5' 
* commit '25609b63d2e07d26d610f485a22082d32c96c0f5':
  dcadec: store the stereo downmix coefficients as float in the DCAContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 00:24:41 +01:00
Michael Niedermayer
cb751a6a96 Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e' 
* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
  dcadec: implement request_channel_layout.

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-29 00:18:42 +01:00
Stefano Sabatini
d1daa71f9d doc/ffserver: mention remaining stream options 2013-11-29 00:04:17 +01:00
Stefano Sabatini
f652f70e32 doc/ffserver: move general stream options upwards in the list 2013-11-29 00:04:17 +01:00
Stefano Sabatini
a42c20f089 doc/ffserver: reorder/extend stream video encoding options 2013-11-29 00:04:17 +01:00
Stefano Sabatini
b9a3ac89c8 doc/ffserver: fix bitrate unit for bitrate option 2013-11-29 00:04:17 +01:00
Stefano Sabatini
ab89d2dd2a ffserver: fix typo in comment: defaut -> default 2013-11-28 23:13:46 +01:00
Stefano Sabatini
6aea3d597e doc/ffserver: add notice about re-launch behavior 2013-11-28 23:13:46 +01:00
Stefano Sabatini
2a0349786a doc/ffserver: document InputFormat stream option 2013-11-28 23:13:45 +01:00
Stefano Sabatini
77f5cb92af ffserver: factorize code setting ReadOnlyFile/File options 2013-11-28 23:13:45 +01:00
Stefano Sabatini
0e1e5d0053 ffserver: improve error feedback in open_input_stream() 2013-11-28 23:13:45 +01:00
Stefano Sabatini
ddab41995f ffserver: drop stream AudioQuality option 
It has no effect, and it was never documented.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini
4f60d53b18 ffserver: add comment about how Launch path program is created 2013-11-28 23:13:45 +01:00
Stefano Sabatini
7cbbc4f7e7 ffserver: extend error handling when parsing the configuration file 
In particular, abort immediately in case of memory error, avoid potential
crashes.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini
04702a0d3d ffserver: add some error handling to main() 2013-11-28 23:13:45 +01:00
Michael Niedermayer
3adb825650 Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5' 
* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
  x86: dsputil: Suppress deprecation warnings for XvMC bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 22:47:37 +01:00