Commits · fcd1f6bc9d5caec25d925c5c4aa44cef15c37897 · Linshizhi / ffmpeg.wasm-core

07 Jul, 2014 12 commits

avutil/bprint: Add av_bprint_fd_contents() · fcd1f6bc
Andrey Utkin authored Jul 03, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fcd1f6bc

Michael Niedermayer authored Jul 07, 2014

* commit '246f8695':
  vmd: Split audio and video decoder

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

06dae71d

vmd: Split audio and video decoder · 246f8695
Nidhi Makhijani authored Jul 07, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
246f8695
avcodec/cljrdec: remove unneeded include · 5320b34b
Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5320b34b

Merge commit '' · 3790801f

Michael Niedermayer authored Jul 07, 2014

* commit '3c650efb':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3790801f

Merge commit '' · 020865f5

Michael Niedermayer authored Jul 07, 2014

* commit 'c1661484':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

020865f5

Merge commit '' · 462c6cdb

Michael Niedermayer authored Jul 07, 2014

* commit '8d686ca5':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

462c6cdb

avcodec/mpegvideo_enc: fix b frame strategy 2 · 8324bd51
Michael Niedermayer authored Jul 07, 2014
```
Fixes Ticket3757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8324bd51

transcoding: fix Doxygen file path · 3be90723

Timothy Gu authored Jul 07, 2014

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

3be90723

avcodec/mpegvideo: small indent fix in vismv code · 7ac7e879
Clément Bœsch authored Jul 07, 2014

7ac7e879
avcodec: make vismv option as flag types · 5f4dbf3c
Clément Bœsch authored Jul 07, 2014
```
This allows for example -vismv pf+bf+bb instead of -vismv 7.
```
5f4dbf3c

avcodec/roqvideodec: set JPEG output color range · 58640698

Eric Lasota authored Jul 06, 2014

Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

58640698

06 Jul, 2014 28 commits

Merge commit '' · 705eb5a1

Michael Niedermayer authored Jul 06, 2014

* commit 'a7985cfd':
  audio_fifo: Split into a separate doxygen module

Conflicts:
	libavutil/audio_fifo.h

See: 689e0280Merged-by: Michael Niedermayer <michaelni@gmx.at>

705eb5a1

Merge commit '' · 52ea7ffd

Michael Niedermayer authored Jul 06, 2014

* commit 'd69243d3':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

See: b27555a3Merged-by: Michael Niedermayer <michaelni@gmx.at>

52ea7ffd

Merge commit '' · 28c03195

Michael Niedermayer authored Jul 06, 2014

* commit 'd6902070':
  dsicin: Split audio and video decoder

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

28c03195

dsputil: Move draw_edges() to mpegvideoencdsp · 3c650efb
Diego Biurrun authored Feb 03, 2014

3c650efb

Merge commit '' · 96761e93

Michael Niedermayer authored Jul 06, 2014

* commit '2fc85fe9':
  bmv: Split audio and video decoder

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

96761e93

avcodec/roqvideo: use JPEG color range · 8be23d42

Eric Lasota authored Jul 06, 2014

Signed-off-by: ejlasota <ejlasota@gmail.com>

Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8be23d42

dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc · c1661484
Diego Biurrun authored Dec 30, 2013

c1661484
dsputil: Split off *_8x8basis to a separate context · 8d686ca5
Diego Biurrun authored Dec 30, 2013

8d686ca5

swresample: organize functions into doxy groups · 064945b3

Timothy Gu authored Jul 06, 2014

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

064945b3

swresample: better doxy for configuration-returning functions · 81f47e27
Timothy Gu authored Jul 06, 2014
```
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
81f47e27

swresample: improve Doxygen introduction · 2711b470

Timothy Gu authored Jul 06, 2014

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

2711b470

swresample: add SwrContext doxy · 77c5f546

Timothy Gu authored Jul 06, 2014

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

77c5f546

swresample: add SwrDitherType doxy · fc71434e

Timothy Gu authored Jul 06, 2014

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

fc71434e

swresample: group all the option constants in a section in doxy · c0d9b026
Timothy Gu authored Jul 06, 2014
```
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c0d9b026

swresample: grammar/capitalization fixes · 0c583882

Timothy Gu authored Jul 06, 2014

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

0c583882

avutil: actually install hash.h · 02ca9efd

Timothy Gu authored Jul 06, 2014

This header is designed as a public header (with APIchanges entry and
everything), but it is forgotten to put into the headers to be installed
list.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

02ca9efd

audio_fifo: Split into a separate doxygen module · a7985cfd

Timothy Gu authored Jul 06, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

a7985cfd

samplefmt: Add doxygen categories · d69243d3

Timothy Gu authored Jul 06, 2014

Categorize the enum and functions as "audio-related".
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

d69243d3

x86/svq1enc: use unaligned mov on SSE2 · 195f7bd2

James Almer authored Jul 06, 2014

Might fix fate failures on some systems
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

195f7bd2

dsicin: Split audio and video decoder · d6902070
Nidhi Makhijani authored Jul 06, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
d6902070

Merge commit '' · 0d1994ee

Michael Niedermayer authored Jul 06, 2014

* commit 'b0633f83':
  paf: split audio and video decoder

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

0d1994ee

Merge commit '' · 225c5cc8

Michael Niedermayer authored Jul 06, 2014

* commit '373a6dda':
  cljr: split decoder and encoder

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

225c5cc8

bmv: Split audio and video decoder · 2fc85fe9
Nidhi Makhijani authored Jul 06, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
2fc85fe9

Merge commit '' · 3a29af4e

Michael Niedermayer authored Jul 06, 2014

* commit '02a7a5e3':
  vc1test: Check malloc call

Conflicts:
	libavformat/vc1test.c

See: a807c682Merged-by: Michael Niedermayer <michaelni@gmx.at>

3a29af4e

Merge commit '' · d95a0454

Michael Niedermayer authored Jul 06, 2014

* commit '77fc7b76':
  vc1test: Return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d95a0454

Merge commit '' · 1c8c4b8a

Michael Niedermayer authored Jul 06, 2014

* commit '86546109':
  librtmp: Don't free the temp url at the end of rtmp_open

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

1c8c4b8a

paf: split audio and video decoder · b0633f83
Nidhi Makhijani authored Jul 06, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
b0633f83
cljr: split decoder and encoder · 373a6dda
Nidhi Makhijani authored Jul 05, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
373a6dda