diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 15:00:53 +0200 |
| commit | 58bdec57fa92cca36df470bf16bc8d124d142479 (patch) | |
| tree | eb6a7b30f796c4631266e9db42f95c451c9322e6 /libavcodec/smc.c | |
| parent | 7434225ed15d7326cf9d906a7cd3539eb8184e8e (diff) | |
| parent | 1147d39bca135df8673031d16989ba486a52172a (diff) | |
Merge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1
* commit '1147d39bca135df8673031d16989ba486a52172a':
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/smc.c')
0 files changed, 0 insertions, 0 deletions