Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'

Browse Source

* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
  lavc: split slice and frame threading functions into separate files

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c

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

...

This commit is contained in:

Michael Niedermayer

2013-11-04 10:44:34 +01:00

parent 3d4dc43259 cc14ee03a7

commit 4eea41cba1

5 changed files with 1222 additions and 1113 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1115

libavcodec/pthread.c

File diff suppressed because it is too large Load Diff