diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 02:42:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 02:42:30 +0200 |
| commit | 01831fd004908f9dbc3777400169505a63a7adef (patch) | |
| tree | 26be552bd1dced251a55dbcf81d3fb95f30e4273 /libavfilter/vf_signalstats.c | |
| parent | eb1ac04e59cbba7743c10dd5854b6efdfb6a2ebe (diff) | |
| parent | 1c80c9d7ef809180042257200c7b5f6b81d0b0e2 (diff) | |
| download | ffmpeg-01831fd004908f9dbc3777400169505a63a7adef.tar.gz | |
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
hwaccel: Call ->get_format again if hwaccel init fails
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_signalstats.c')
0 files changed, 0 insertions, 0 deletions