Commits · a235af93bd58e99089dcfd428461dc842c867feb · Linshizhi / ffmpeg.wasm-core

30 Nov, 2013 31 commits

avcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated fields · a235af93
Michael Niedermayer authored Nov 30, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a235af93

Merge remote-tracking branch 'cigaes/master' · 98a65784

Michael Niedermayer authored Nov 30, 2013

* cigaes/master:
  lavc/srtenc: use bprint for text buffers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

98a65784

version.sh: make it independant of version.h file name · 802ba5f5

Timothy Gu authored Nov 29, 2013

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

802ba5f5

doc/ffserver: clarify documentation for Feed MaxFileSize option · f2f17dd8
Stefano Sabatini authored Nov 30, 2013

f2f17dd8
doc/ffserver: clarify that note in NoDaemon option documentation · 8209dd33
Stefano Sabatini authored Nov 30, 2013

8209dd33
ffserver: print error code description in case of write_header() failure · b58161d6
Stefano Sabatini authored Nov 29, 2013
```
Improve feedback.
```
b58161d6
doc/ffserver: add "Detailed description" chapter · 889509d2
Stefano Sabatini authored Nov 29, 2013
```
Also move FFM section up in the file, and rename it.
```
889509d2
doc/ffserver: remove more mentions to LAME and build · 0bacc320
Stefano Sabatini authored Nov 29, 2013

0bacc320
lavc/srtenc: use bprint for text buffers. · 4b1c9b72
Nicolas George authored Nov 25, 2013
```
Fix trac ticket #3120.
```
4b1c9b72

lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed · 19e301b9

James Almer authored Nov 29, 2013

They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

19e301b9

Merge remote-tracking branch 'cus/stable' · bd9de4f5

Michael Niedermayer authored Nov 30, 2013

* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update
Merged-by: Michael Niedermayer <michaelni@gmx.at>

bd9de4f5

Merge remote-tracking branch 'qatar/master' · 5d9e6630

Michael Niedermayer authored Nov 30, 2013

* qatar/master:
  go2meeting: disallow tile dimensions that are not multiple of 16
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5d9e6630

Merge commit '' · f09f2951

Michael Niedermayer authored Nov 30, 2013

* commit 'e026ee04':
  mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f09f2951

Merge commit '' · 7f18cb91

Michael Niedermayer authored Nov 30, 2013

* commit '513d849b':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7f18cb91

Merge commit '' · 4c55aa8f

Michael Niedermayer authored Nov 30, 2013

* commit '9ba3fc3e':
  mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4c55aa8f

Merge commit '' · ae4e7f7b

Michael Niedermayer authored Nov 30, 2013

* commit '58c120a9':
  mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ae4e7f7b

Merge commit '' · b27ba2e5

Michael Niedermayer authored Nov 30, 2013

* commit '6e81597d':
  mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b27ba2e5

Merge commit '' · aeead427

Michael Niedermayer authored Nov 30, 2013

* commit '2992afda':
  mpeg4videodec: remove a write-only variable from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

aeead427

Merge commit '' · 1897c4a1

Michael Niedermayer authored Nov 30, 2013

* commit '3b1c0f68':
  mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1897c4a1

Merge commit '' · 47e5eaf8

Michael Niedermayer authored Nov 30, 2013

* commit 'e89247de':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

47e5eaf8

Merge commit '' · f4c28aea

Michael Niedermayer authored Nov 30, 2013

* commit '8cebc9ea':
  mpeg4videodec: remove a write-only variable from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f4c28aea

Merge commit '' · 0cea39fd

Michael Niedermayer authored Nov 30, 2013

* commit 'b1aacd56':
  mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0cea39fd

mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of variables one by one · 79c1cdd9
Michael Niedermayer authored Nov 30, 2013
```
This simplifies the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
79c1cdd9

Merge commit '' · 3e5cd34c

Michael Niedermayer authored Nov 30, 2013

* commit '03889074':
  mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3e5cd34c

avcodec/mpeg4videodec: update bug workaround related variables like they where before · b08ff07d
Michael Niedermayer authored Nov 30, 2013
```
This fixes the code after the variables have been moved into the
mpeg4 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b08ff07d

Merge commit '' · b4ef7447

Michael Niedermayer authored Nov 30, 2013

* commit '43af264d':
  mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b4ef7447

Merge commit '' · ec5499d8

Michael Niedermayer authored Nov 30, 2013

* commit 'e2ceb176':
  mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec

Conflicts:
	libavcodec/h263dec.c
	libavcodec/mpeg4video.h
	libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ec5499d8

avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check · b239f3f6
Michael Niedermayer authored Nov 30, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b239f3f6

Merge commit '' · 2b1922d9

Michael Niedermayer authored Nov 30, 2013

* commit 'b452d5ae':
  mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

Conflicts:
	libavcodec/h263dec.c

not merged, the header decode function is not the right place
See: 6c9b82b6Merged-by: Michael Niedermayer <michaelni@gmx.at>

2b1922d9

avcodec/mpeg4videodec: move bug workaround code into seperate function · 6c9b82b6
Michael Niedermayer authored Nov 30, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6c9b82b6

Merge commit '' · ee9d53e5

Michael Niedermayer authored Nov 29, 2013

* commit '48e13940':
  mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ee9d53e5

29 Nov, 2013 9 commits

h263: remove unused ff_h263_find_resync_marker() · 2d2b363c
Michael Niedermayer authored Nov 29, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2d2b363c

Merge commit '' · 2d614e9b

Michael Niedermayer authored Nov 29, 2013

* commit 'c2f7417e':
  vc1: move MpegEncContext.resync_marker into VC1Context.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2d614e9b

Merge commit '' · 26b526e7

Michael Niedermayer authored Nov 29, 2013

* commit 'a5a71992':
  mpeg4videoenc: don't set MpegEncContext.resync_marker
Merged-by: Michael Niedermayer <michaelni@gmx.at>

26b526e7

Merge commit '' · f5d6541b

Michael Niedermayer authored Nov 29, 2013

* commit 'ad09f525':
  h263dec: remove commented out cruft

Conflicts:
	libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f5d6541b

avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context too · 91c63cb0
Michael Niedermayer authored Nov 29, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
91c63cb0

Merge commit '' · 9c835acc

Michael Niedermayer authored Nov 29, 2013

* commit 'bc5abfb1':
  mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9c835acc

Merge commit '' · cdc21e4a

Michael Niedermayer authored Nov 29, 2013

* commit '9f0617d2':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cdc21e4a

avcodec/mpeg4videodec: Fix code so it also works after moving vol_sprite_usage around · 36068709
Michael Niedermayer authored Nov 29, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
36068709

Merge commit '' · 68c90fc0

Michael Niedermayer authored Nov 29, 2013

* commit '1a890257':
  mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

68c90fc0