diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:27:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:27:27 +0200 |
commit | f2275400fe52cd0a58e532a2d048c094a5074068 (patch) | |
tree | 2f4a45a83e5c2e1e75266a1a001759625a0b60e4 /doc/examples/metadata.c | |
parent | 1ab94468dd99bc5f9d37a97aa73722c2945cdfc3 (diff) | |
parent | 3ee26080d6b3e777992b4b4124e62e1bf0ac0a65 (diff) | |
download | ffmpeg-f2275400fe52cd0a58e532a2d048c094a5074068.tar.gz |
Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10
* commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65':
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions