diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-25 23:10:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-25 23:10:14 +0200 |
| commit | ef2a85ac532117b13087f3ceabeb450f12d26c7e (patch) | |
| tree | 6dae7f787d02ac09694a5bc8062eb18e6eca0621 /libswscale/arm/Makefile | |
| parent | c105e0f077fb988d5c19e1a1beadf839f01e1a3e (diff) | |
| parent | aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d (diff) | |
| download | ffmpeg-ef2a85ac532117b13087f3ceabeb450f12d26c7e.tar.gz | |
Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
qsvdec: avoid an infinite loop with no consumed data and no output
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/arm/Makefile')
0 files changed, 0 insertions, 0 deletions